summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorBernd Wachter <bwachter-tmw@lart.info>2011-10-24 20:28:15 +0300
committerBernd Wachter <bwachter-tmw@lart.info>2011-10-25 13:36:33 +0300
commit8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (patch)
tree5c57e4ee47518bb21ce2f0dc10d5fac963875af7 /libs
parent9c5791d3e3b413d8b703f1530f67de8936a3434c (diff)
downloadMana-8954a7ca0f70bbf167c9119d26c7bca8407e8da6.tar.gz
Mana-8954a7ca0f70bbf167c9119d26c7bca8407e8da6.tar.bz2
Mana-8954a7ca0f70bbf167c9119d26c7bca8407e8da6.tar.xz
Mana-8954a7ca0f70bbf167c9119d26c7bca8407e8da6.zip
Change the wrong, but mostly supported WIN32 macro to the correct _WIN32, enforced by -std=c++0x
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'libs')
-rw-r--r--libs/enet/include/enet/enet.h2
-rw-r--r--libs/enet/protocol.c4
-rw-r--r--libs/enet/unix.c2
-rw-r--r--libs/enet/win32.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/libs/enet/include/enet/enet.h b/libs/enet/include/enet/enet.h
index 02dc2c0a..c5338676 100644
--- a/libs/enet/include/enet/enet.h
+++ b/libs/enet/include/enet/enet.h
@@ -12,7 +12,7 @@ extern "C"
#include <stdlib.h>
-#ifdef WIN32
+#ifdef _WIN32
#include "enet/win32.h"
#else
#include "enet/unix.h"
diff --git a/libs/enet/protocol.c b/libs/enet/protocol.c
index d7c3fede..b51ab469 100644
--- a/libs/enet/protocol.c
+++ b/libs/enet/protocol.c
@@ -1575,7 +1575,7 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
enet_uint32 packetLoss = currentPeer -> packetsLost * ENET_PEER_PACKET_LOSS_SCALE / currentPeer -> packetsSent;
#ifdef ENET_DEBUG
-#ifdef WIN32
+#ifdef _WIN32
printf (
#else
fprintf (stderr,
@@ -1625,7 +1625,7 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
host -> headerFlags |= ENET_PROTOCOL_HEADER_FLAG_COMPRESSED;
shouldCompress = compressedSize;
#ifdef ENET_DEBUG_COMPRESS
-#ifdef WIN32
+#ifdef _WIN32
printf (
#else
fprintf (stderr,
diff --git a/libs/enet/unix.c b/libs/enet/unix.c
index 69715413..75c78bc8 100644
--- a/libs/enet/unix.c
+++ b/libs/enet/unix.c
@@ -2,7 +2,7 @@
@file unix.c
@brief ENet Unix system specific functions
*/
-#ifndef WIN32
+#ifndef _WIN32
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/libs/enet/win32.c b/libs/enet/win32.c
index e1fae233..0b32e633 100644
--- a/libs/enet/win32.c
+++ b/libs/enet/win32.c
@@ -2,7 +2,7 @@
@file win32.c
@brief ENet Win32 system specific functions
*/
-#ifdef WIN32
+#ifdef _WIN32
#include <time.h>
#define ENET_BUILDING_LIB 1