Merge branch '0.4.x' into 0.5.x

[novacoin.git] / src / headers.h

diff --git a/src/headers.h b/src/headers.h
index 1e174da..ea011c5 100644 (file)
--- a/src/headers.h
+++ b/src/headers.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2011 The Bitcoin developers
+// Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
@@ -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>
@@ -79,8 +83,6 @@
 #endif
 
 
-#pragma hdrstop
-
 #include "serialize.h"
 #include "uint256.h"
 #include "util.h"