Merge pull request XRPLF#340 from dschmidt/master

Use _WIN32 instead of WIN32 preprocessor directive
rec · Mar 16, 2014 · 2207348 · 2207348
2 parents 8752687 + 77495d4
commit 2207348
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/websocketpp/common/network.hpp b/websocketpp/common/network.hpp
@@ -29,7 +29,7 @@
 #define WEBSOCKETPP_COMMON_NETWORK_HPP
 
 // For ntohs and htons
-#if defined(WIN32)
+#if defined(_WIN32)
     #include <winsock2.h>
 #else
     //#include <arpa/inet.h>

diff --git a/websocketpp/common/platforms.hpp b/websocketpp/common/platforms.hpp
@@ -33,7 +33,7 @@
  * don't fit somewhere else better.
  */
 
-#if defined(WIN32) && !defined(NOMINMAX)
+#if defined(_WIN32) && !defined(NOMINMAX)
     // don't define min and max macros that conflict with std::min and std::max
     #define NOMINMAX
 #endif

diff --git a/websocketpp/common/stdint.hpp b/websocketpp/common/stdint.hpp
@@ -32,7 +32,7 @@
     #define __STDC_LIMIT_MACROS 1
 #endif
 
-#if WIN32 && (_MSC_VER < 1600)
+#if defined (_WIN32) && defined (_MSC_VER) && (_MSC_VER < 1600)
     #include <boost/cstdint.hpp>
 
     using boost::int8_t;