diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-10-10 12:08:05 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-25 11:39:17 -0400 |
| commit | 25a9a1f62bf79a3e28c2221d3dcd6a75db126d9f (patch) | |
| tree | 832aa1794cb04881ebc688ea6218b0116e983ae2 | |
| parent | f891cc941598cfc185c977b56ef752f7bfb5aaf1 (diff) | |
Only define __STDC_LIMIT_MACROS if not already defined.
| -rw-r--r-- | src/headers.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/headers.h b/src/headers.h index 1e174da0de..fd086faee8 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 <boost/foreach.hpp> +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h +#endif + #if (defined(__unix__) || defined(unix)) && !defined(USG) #include <sys/param.h> // to get BSD define #endif @@ -49,8 +55,6 @@ #include <deque> #include <map> -#include <boost/foreach.hpp> - #ifdef WIN32 #include <windows.h> #include <winsock2.h> |