socklen_t isn't actually needed in either i_tcp.c or mserv.c if NONET is on!
(also added some more tabbing)
This commit is contained in:
parent
0f4487eb68
commit
b8a794e37f
43
src/i_tcp.c
43
src/i_tcp.c
|
@ -171,32 +171,31 @@
|
||||||
#define DEFAULTPORT "5029"
|
#define DEFAULTPORT "5029"
|
||||||
|
|
||||||
#if defined (USE_WINSOCK) && !defined (NONET)
|
#if defined (USE_WINSOCK) && !defined (NONET)
|
||||||
typedef SOCKET SOCKET_TYPE;
|
typedef SOCKET SOCKET_TYPE;
|
||||||
#define ERRSOCKET (SOCKET_ERROR)
|
#define ERRSOCKET (SOCKET_ERROR)
|
||||||
#else
|
#else
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
|
#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
|
||||||
typedef int SOCKET_TYPE;
|
typedef int SOCKET_TYPE;
|
||||||
#else
|
#else
|
||||||
typedef unsigned long SOCKET_TYPE;
|
typedef unsigned long SOCKET_TYPE;
|
||||||
#endif
|
#endif
|
||||||
#define ERRSOCKET (-1)
|
#define ERRSOCKET (-1)
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
|
|
||||||
typedef int socklen_t;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NONET
|
#ifndef NONET
|
||||||
static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET};
|
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
|
||||||
static size_t mysocketses = 0;
|
typedef int socklen_t;
|
||||||
static int myfamily[MAXNETNODES+1] = {0};
|
#endif
|
||||||
static SOCKET_TYPE nodesocket[MAXNETNODES+1] = {ERRSOCKET};
|
static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET};
|
||||||
static mysockaddr_t clientaddress[MAXNETNODES+1];
|
static size_t mysocketses = 0;
|
||||||
static mysockaddr_t broadcastaddress[MAXNETNODES+1];
|
static int myfamily[MAXNETNODES+1] = {0};
|
||||||
static size_t broadcastaddresses = 0;
|
static SOCKET_TYPE nodesocket[MAXNETNODES+1] = {ERRSOCKET};
|
||||||
static boolean nodeconnected[MAXNETNODES+1];
|
static mysockaddr_t clientaddress[MAXNETNODES+1];
|
||||||
static mysockaddr_t banned[MAXBANS];
|
static mysockaddr_t broadcastaddress[MAXNETNODES+1];
|
||||||
static UINT8 bannedmask[MAXBANS];
|
static size_t broadcastaddresses = 0;
|
||||||
|
static boolean nodeconnected[MAXNETNODES+1];
|
||||||
|
static mysockaddr_t banned[MAXBANS];
|
||||||
|
static UINT8 bannedmask[MAXBANS];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static size_t numbans = 0;
|
static size_t numbans = 0;
|
||||||
|
|
31
src/mserv.c
31
src/mserv.c
|
@ -198,26 +198,25 @@ static INT32 msnode = -1;
|
||||||
UINT16 current_port = 0;
|
UINT16 current_port = 0;
|
||||||
|
|
||||||
#if defined (_WIN32) && !defined (NONET)
|
#if defined (_WIN32) && !defined (NONET)
|
||||||
typedef SOCKET SOCKET_TYPE;
|
typedef SOCKET SOCKET_TYPE;
|
||||||
#define ERRSOCKET (SOCKET_ERROR)
|
#define ERRSOCKET (SOCKET_ERROR)
|
||||||
#else
|
#else
|
||||||
#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
|
#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
|
||||||
typedef int SOCKET_TYPE;
|
typedef int SOCKET_TYPE;
|
||||||
#else
|
#else
|
||||||
typedef unsigned long SOCKET_TYPE;
|
typedef unsigned long SOCKET_TYPE;
|
||||||
#endif
|
#endif
|
||||||
#define ERRSOCKET (-1)
|
#define ERRSOCKET (-1)
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
|
|
||||||
typedef int socklen_t;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NONET
|
#ifndef NONET
|
||||||
static SOCKET_TYPE socket_fd = ERRSOCKET; // WINSOCK socket
|
#if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
|
||||||
static struct timeval select_timeout;
|
typedef int socklen_t;
|
||||||
static fd_set wset;
|
#endif
|
||||||
static size_t recvfull(SOCKET_TYPE s, char *buf, size_t len, int flags);
|
static SOCKET_TYPE socket_fd = ERRSOCKET; // WINSOCK socket
|
||||||
|
static struct timeval select_timeout;
|
||||||
|
static fd_set wset;
|
||||||
|
static size_t recvfull(SOCKET_TYPE s, char *buf, size_t len, int flags);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Room list is an external variable now.
|
// Room list is an external variable now.
|
||||||
|
|
Loading…
Reference in a new issue