Only define __STDC_LIMIT_MACROS if not already defined.

This commit is contained in:
Matt Corallo 2011-10-10 12:08:05 -04:00 committed by Gavin Andresen
parent f891cc9415
commit 25a9a1f62b

View File

@ -18,7 +18,13 @@
#endif #endif
#define _WIN32_IE 0x0400 #define _WIN32_IE 0x0400
#define WIN32_LEAN_AND_MEAN 1 #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 #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
#endif
#if (defined(__unix__) || defined(unix)) && !defined(USG) #if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h> // to get BSD define #include <sys/param.h> // to get BSD define
#endif #endif
@ -49,8 +55,6 @@
#include <deque> #include <deque>
#include <map> #include <map>
#include <boost/foreach.hpp>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>