From: Matt Corallo Date: Mon, 10 Oct 2011 16:08:05 +0000 (-0400) Subject: Only define __STDC_LIMIT_MACROS if not already defined. X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~2^2^2~112 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=ed176ba584ed9f05f5311743059e108ddbbb5d5b Only define __STDC_LIMIT_MACROS if not already defined. --- diff --git a/src/headers.h b/src/headers.h index d0c7434..ab318cb 100644 --- a/src/headers.h +++ b/src/headers.h @@ -18,7 +18,13 @@ #endif #define _WIN32_IE 0x0400 #define WIN32_LEAN_AND_MEAN 1 + +// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems. +#include +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h +#endif + #if (defined(__unix__) || defined(unix)) && !defined(USG) #include // to get BSD define #endif @@ -57,8 +63,6 @@ #include #include -#include - #ifdef __WXMSW__ #include #include