From 25a9a1f62bf79a3e28c2221d3dcd6a75db126d9f Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Mon, 10 Oct 2011 12:08:05 -0400
Subject: Only define __STDC_LIMIT_MACROS if not already defined.

---
 src/headers.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3