diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /libs/enet/protocol.c | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'libs/enet/protocol.c')
| -rw-r--r-- | libs/enet/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |