Only define __STDC_LIMIT_MACROS if not already defined.

diff --git a/src/headers.h b/src/headers.h
index d0c7434..ab318cb 100644 (file)
--- 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>