Skip to content

Commit

Permalink
Eliminate redundant duplications of convert functions
Browse files Browse the repository at this point in the history
  • Loading branch information
nxrighthere authored Nov 7, 2018
1 parent 69bf744 commit ad27538
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions Source/Native/enet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit ad27538

Please sign in to comment.