aboutsummaryrefslogtreecommitdiff
path: root/src/headers.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-10-07 11:02:21 -0400
committerGavin Andresen <gavinandresen@gmail.com>2011-10-07 11:02:21 -0400
commit6853e627f12de21b38a178def14c067435517d96 (patch)
tree74a7142b2266b992b432bab674e412ddb3464db7 /src/headers.h
parente9b95e4f6c35cb0f150ff7e70154668f142ee0ba (diff)
downloadbitcoin-6853e627f12de21b38a178def14c067435517d96.tar.xz
Fix build on windows and mac
Replaced all occurrences of #if* __WXMSW__ with WIN32, and all occurrences of __WXMAC_OSX__ with MAC_OSX, and made sure those are defined appropriately in the makefile and bitcoin-qt.pro.
Diffstat (limited to 'src/headers.h')
-rw-r--r--src/headers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/headers.h b/src/headers.h
index 17e9b3bc52..1e174da0de 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -22,7 +22,7 @@
#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h> // to get BSD define
#endif
-#ifdef __WXMAC_OSX__
+#ifdef MAC_OSX
#ifndef BSD
#define BSD 1
#endif
@@ -51,7 +51,7 @@
#include <boost/foreach.hpp>
-#ifdef __WXMSW__
+#ifdef WIN32
#include <windows.h>
#include <winsock2.h>
#include <mswsock.h>