diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-10-10 12:08:05 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-11-02 11:02:13 -0400 |
| commit | ed176ba584ed9f05f5311743059e108ddbbb5d5b (patch) | |
| tree | 2cc7b6a522a91d37d91192253d9815c2e9fee35d | |
| parent | 38a976d5bbfb1bdb304ae64aa3ca992d13ad3cde (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 d0c7434820..ab318cbb43 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 @@ -57,8 +63,6 @@ #include <deque> #include <map> -#include <boost/foreach.hpp> - #ifdef __WXMSW__ #include <windows.h> #include <winsock2.h> |