summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/malloc.c1
-rw-r--r--src/common/socket.c15
2 files changed, 5 insertions, 11 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c
index fe73057ad..1417bfbec 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -651,6 +651,7 @@ static void memmgr_init (void)
}
#endif
+
/*======================================
* Initialise
*--------------------------------------
diff --git a/src/common/socket.c b/src/common/socket.c
index 3c8396961..6589978bb 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -35,6 +35,10 @@
#define S_ENOTSOCK WSAENOTSOCK
#define S_EWOULDBLOCK WSAEWOULDBLOCK
#define S_ECONNABORTED WSAECONNABORTED
+
+ #define SHUT_RD SD_RECEIVE
+ #define SHUT_WR SD_SEND
+ #define SHUT_RDWR SD_BOTH
#else
#define SOCKET_ERROR -1
#define INVALID_SOCKET -1
@@ -56,17 +60,6 @@
#include "../common/malloc.h"
#include "../common/showmsg.h"
-/// shutdown() constants
-#ifndef SHUT_RD
-#ifdef SD_RECEIVE
- #define SHUT_RD SD_RECEIVE
- #define SHUT_WR SD_SEND
- #define SHUT_RDWR SD_BOTH
-#else
- #error "Unknown socket constants, please report this to a developer"
-#endif
-#endif
-
fd_set readfds;
int fd_max;
time_t last_tick;