diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
| commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
| tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b /src/headers.h | |
| parent | ba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff) | |
| parent | 4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff) | |
| download | bitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/headers.h')
| -rw-r--r-- | src/headers.h | 4 |
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> |