From 23eb96579cf0e6ba27bcbef91bcb738bd0da27ad Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 24 Feb 2020 18:11:41 -0500 Subject: [PATCH] Fix duplicate __STDC_FORMAT_MACROS definition. --- include/verilatedos.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/verilatedos.h b/include/verilatedos.h index 1db5ad3e1..cc3bdd3b3 100644 --- a/include/verilatedos.h +++ b/include/verilatedos.h @@ -223,9 +223,12 @@ #ifdef __MINGW32__ # define __USE_MINGW_ANSI_STDIO 1 // Force old MinGW (GCC 5 and older) to use C99 formats -# define __STDC_FORMAT_MACROS 1 // Otherwise MinGW doesn't get PRId64 for fstapi.c #endif +// The inttypes supplied with some GCC & MINGW32 versions requires STDC_FORMAT_MACROS +// to be declared in order to get the PRIxx macros used by fstapi.c +#define __STDC_FORMAT_MACROS + #if defined(__CYGWIN__) # include @@ -273,10 +276,6 @@ typedef signed __int32 ssize_t; ///< signed size_t; returned fro #else // Linux or compliant Unix flavors, -m64 -// The inttypes supplied with some GCC versions requires STDC_FORMAT_MACROS -// to be declared in order to get the PRIxx macros used by fstapi.c -#define __STDC_FORMAT_MACROS - # include // Solaris # include // Linux and most flavors # include // __WORDSIZE