From 26db62d77d834522e1ab45faacadd5a3fe009b4c Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sat, 31 May 2014 12:25:44 +0000 Subject: [PATCH] Re-fix the C++ warnings in ENet. git-svn-id: https://svn.eduke32.com/eduke32@4494 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/enet/src/peer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/source/enet/src/peer.c b/polymer/eduke32/source/enet/src/peer.c index abe94dda6..cb3b18ad0 100644 --- a/polymer/eduke32/source/enet/src/peer.c +++ b/polymer/eduke32/source/enet/src/peer.c @@ -459,7 +459,7 @@ enet_peer_ping (ENetPeer * peer) void enet_peer_ping_interval (ENetPeer * peer, enet_uint32 pingInterval) { - peer -> pingInterval = pingInterval ? pingInterval : ENET_PEER_PING_INTERVAL; + peer -> pingInterval = pingInterval ? pingInterval : (enet_uint32)ENET_PEER_PING_INTERVAL; } /** Sets the timeout parameters for a peer. @@ -482,9 +482,9 @@ enet_peer_ping_interval (ENetPeer * peer, enet_uint32 pingInterval) void enet_peer_timeout (ENetPeer * peer, enet_uint32 timeoutLimit, enet_uint32 timeoutMinimum, enet_uint32 timeoutMaximum) { - peer -> timeoutLimit = timeoutLimit ? timeoutLimit : ENET_PEER_TIMEOUT_LIMIT; - peer -> timeoutMinimum = timeoutMinimum ? timeoutMinimum : ENET_PEER_TIMEOUT_MINIMUM; - peer -> timeoutMaximum = timeoutMaximum ? timeoutMaximum : ENET_PEER_TIMEOUT_MAXIMUM; + peer -> timeoutLimit = timeoutLimit ? timeoutLimit : (enet_uint32)ENET_PEER_TIMEOUT_LIMIT; + peer -> timeoutMinimum = timeoutMinimum ? timeoutMinimum : (enet_uint32)ENET_PEER_TIMEOUT_MINIMUM; + peer -> timeoutMaximum = timeoutMaximum ? timeoutMaximum : (enet_uint32)ENET_PEER_TIMEOUT_MAXIMUM; } /** Force an immediate disconnection from a peer.