Browse Source

Eliminate redundant duplications of convert functions

NX 7 years ago
parent
commit
ad275382b3
1 changed files with 6 additions and 12 deletions
  1. 6 12
      Source/Native/enet.h

+ 6 - 12
Source/Native/enet.h

@@ -101,12 +101,6 @@
 
     #define ENET_SOCKET_NULL INVALID_SOCKET
 
-    #define ENET_HOST_TO_NET_16(value) (htons(value))
-    #define ENET_HOST_TO_NET_32(value) (htonl(value))
-
-    #define ENET_NET_TO_HOST_16(value) (ntohs(value))
-    #define ENET_NET_TO_HOST_32(value) (ntohl(value))
-
     typedef struct {
         size_t dataLength;
         void * data;
@@ -163,12 +157,6 @@
 
     #define ENET_SOCKET_NULL -1
 
-    #define ENET_HOST_TO_NET_16(value) (htons(value))
-    #define ENET_HOST_TO_NET_32(value) (htonl(value))
-
-    #define ENET_NET_TO_HOST_16(value) (ntohs(value))
-    #define ENET_NET_TO_HOST_32(value) (ntohl(value))
-
     typedef struct {
         void * data;
         size_t dataLength;
@@ -196,6 +184,11 @@
 #define ENET_HOST_BROADCAST 0xFFFFFFFFU
 #define ENET_PORT_ANY       0
 
+#define ENET_HOST_TO_NET_16(value) (htons(value))
+#define ENET_HOST_TO_NET_32(value) (htonl(value))
+#define ENET_NET_TO_HOST_16(value) (ntohs(value))
+#define ENET_NET_TO_HOST_32(value) (ntohl(value))
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2085,6 +2078,7 @@ extern "C" {
         roundTripTime = ENET_TIME_DIFFERENCE(host->serviceTime, receivedSentTime);
 
         enet_peer_throttle(peer, roundTripTime);
+
         peer->roundTripTimeVariance -= peer->roundTripTimeVariance / 4;
 
         if (roundTripTime >= peer->roundTripTime) {