Skip to content

Commit 77495d4

Browse files
committed
Use _WIN32 instead of WIN32 preprocessor directive and fix warnings
1 parent 8752687 commit 77495d4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

websocketpp/common/network.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define WEBSOCKETPP_COMMON_NETWORK_HPP
3030

3131
// For ntohs and htons
32-
#if defined(WIN32)
32+
#if defined(_WIN32)
3333
#include <winsock2.h>
3434
#else
3535
//#include <arpa/inet.h>

websocketpp/common/platforms.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* don't fit somewhere else better.
3434
*/
3535

36-
#if defined(WIN32) && !defined(NOMINMAX)
36+
#if defined(_WIN32) && !defined(NOMINMAX)
3737
// don't define min and max macros that conflict with std::min and std::max
3838
#define NOMINMAX
3939
#endif

websocketpp/common/stdint.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define __STDC_LIMIT_MACROS 1
3333
#endif
3434

35-
#if WIN32 && (_MSC_VER < 1600)
35+
#if defined (_WIN32) && defined (_MSC_VER) && (_MSC_VER < 1600)
3636
#include <boost/cstdint.hpp>
3737

3838
using boost::int8_t;

0 commit comments

Comments
 (0)