From 1805e42582fa455e24065025e6d5679a9ff151ad Mon Sep 17 00:00:00 2001 From: Garux Date: Fri, 7 Feb 2020 22:45:06 +0300 Subject: [PATCH] make C code to compile with -std=c11 (though still many implicit function declarations) --- libs/l_net/l_net_berkley.c | 20 +++++++++---------- libs/l_net/l_net_wins.c | 20 +++++++++---------- tools/mbspc/mbspc/bspc.c | 2 +- tools/mbspc/mbspc/l_qfiles.c | 2 +- tools/quake2/common/path_init.c | 1 + tools/quake2/qdata/qdata.c | 2 +- .../quake2/qdata_heretic2/common/path_init.c | 1 + tools/quake2/qdata_heretic2/qdata.c | 2 +- tools/quake3/common/vfs.h | 1 + tools/quake3/q3data/q3data.c | 2 +- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/libs/l_net/l_net_berkley.c b/libs/l_net/l_net_berkley.c index c48b492a..a0fc4bba 100644 --- a/libs/l_net/l_net_berkley.c +++ b/libs/l_net/l_net_berkley.c @@ -200,7 +200,7 @@ int WINS_Init( void ){ ( (struct sockaddr_in *)&broadcastaddr )->sin_family = AF_INET; ( (struct sockaddr_in *)&broadcastaddr )->sin_addr.s_addr = INADDR_BROADCAST; - ( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (unsigned short)net_hostport ); WINS_GetSocketAddr( net_controlsocket, &addr ); strcpy( my_tcpip_address, WINS_AddrToString( &addr ) ); @@ -268,7 +268,7 @@ void WINS_Shutdown( void ){ int WINS_OpenSocket( int port ){ int newsocket; struct sockaddr_in address; - u_long _true = 1; + unsigned long _true = 1; if ( ( newsocket = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == SOCKET_ERROR ) { WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); @@ -284,7 +284,7 @@ int WINS_OpenSocket( int port ){ memset( (char *) &address, 0, sizeof( address ) ); address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; - address.sin_port = htons( (u_short)port ); + address.sin_port = htons( (unsigned short)port ); if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) { WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); closesocket( newsocket ); @@ -314,7 +314,7 @@ int WINS_OpenReliableSocket( int port ){ memset( (char *) &address, 0, sizeof( address ) ); address.sin_family = AF_INET; address.sin_addr.s_addr = htonl( INADDR_ANY ); - address.sin_port = htons( (u_short)port ); + address.sin_port = htons( (unsigned short)port ); if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) { WinPrint( "WINS_OpenReliableSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); closesocket( newsocket ); @@ -336,7 +336,7 @@ int WINS_OpenReliableSocket( int port ){ // Changes Globals: - //=========================================================================== int WINS_Listen( int socket ){ - u_long _true = 1; + unsigned long _true = 1; if ( ioctlsocket( socket, FIONBIO, &_true ) == -1 ) { WinPrint( "WINS_Listen: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); @@ -430,7 +430,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){ } hostaddr->sa_family = AF_INET; - ( (struct sockaddr_in *)hostaddr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)hostaddr )->sin_port = htons( (unsigned short)net_hostport ); ( (struct sockaddr_in *)hostaddr )->sin_addr.s_addr = ( myAddr & htonl( mask ) ) | htonl( addr ); return 0; @@ -443,7 +443,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){ //=========================================================================== int WINS_Connect( int socket, struct sockaddr_s *addr ){ int ret; - u_long _true2 = 0xFFFFFFFF; + unsigned long _true2 = 0xFFFFFFFF; ret = connect( socket, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) ); if ( ret == SOCKET_ERROR ) { @@ -621,7 +621,7 @@ int WINS_StringToAddr( char *string, struct sockaddr_s *addr ){ addr->sa_family = AF_INET; ( (struct sockaddr_in *)addr )->sin_addr.s_addr = htonl( ipaddr ); - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)hp ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)hp ); return 0; } //end of the function WINS_StringToAddr //=========================================================================== @@ -680,7 +680,7 @@ int WINS_GetAddrFromName( char *name, struct sockaddr_s *addr ){ } addr->sa_family = AF_INET; - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)net_hostport ); ( (struct sockaddr_in *)addr )->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0]; return 0; @@ -722,6 +722,6 @@ int WINS_GetSocketPort( struct sockaddr_s *addr ){ // Changes Globals: - //=========================================================================== int WINS_SetSocketPort( struct sockaddr_s *addr, int port ){ - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)port ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)port ); return 0; } //end of the function WINS_SetSocketPort diff --git a/libs/l_net/l_net_wins.c b/libs/l_net/l_net_wins.c index c62d40f6..48bc7e76 100644 --- a/libs/l_net/l_net_wins.c +++ b/libs/l_net/l_net_wins.c @@ -221,7 +221,7 @@ int WINS_Init( void ){ ( (struct sockaddr_in *)&broadcastaddr )->sin_family = AF_INET; ( (struct sockaddr_in *)&broadcastaddr )->sin_addr.s_addr = INADDR_BROADCAST; - ( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (unsigned short)net_hostport ); WINS_GetSocketAddr( net_controlsocket, &addr ); strcpy( my_tcpip_address, WINS_AddrToString( &addr ) ); @@ -289,7 +289,7 @@ void WINS_Shutdown( void ){ int WINS_OpenSocket( int port ){ int newsocket; struct sockaddr_in address; - u_long _true = 1; + unsigned long _true = 1; if ( ( newsocket = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == -1 ) { WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); @@ -305,7 +305,7 @@ int WINS_OpenSocket( int port ){ memset( (char *) &address, 0, sizeof( address ) ); address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; - address.sin_port = htons( (u_short)port ); + address.sin_port = htons( (unsigned short)port ); if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) { WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); closesocket( newsocket ); @@ -335,7 +335,7 @@ int WINS_OpenReliableSocket( int port ){ memset( (char *) &address, 0, sizeof( address ) ); address.sin_family = AF_INET; address.sin_addr.s_addr = htonl( INADDR_ANY ); - address.sin_port = htons( (u_short)port ); + address.sin_port = htons( (unsigned short)port ); if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) { WinPrint( "WINS_OpenReliableSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); closesocket( newsocket ); @@ -357,7 +357,7 @@ int WINS_OpenReliableSocket( int port ){ // Changes Globals: - //=========================================================================== int WINS_Listen( int socket ){ - u_long _true = 1; + unsigned long _true = 1; if ( ioctlsocket( socket, FIONBIO, &_true ) == -1 ) { WinPrint( "WINS_Listen: %s\n", WINS_ErrorMessage( WSAGetLastError() ) ); @@ -451,7 +451,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){ } hostaddr->sa_family = AF_INET; - ( (struct sockaddr_in *)hostaddr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)hostaddr )->sin_port = htons( (unsigned short)net_hostport ); ( (struct sockaddr_in *)hostaddr )->sin_addr.s_addr = ( myAddr & htonl( mask ) ) | htonl( addr ); return 0; @@ -464,7 +464,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){ //=========================================================================== int WINS_Connect( int socket, struct sockaddr_s *addr ){ int ret; - u_long _true2 = 0xFFFFFFFF; + unsigned long _true2 = 0xFFFFFFFF; ret = connect( socket, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) ); if ( ret == SOCKET_ERROR ) { @@ -635,7 +635,7 @@ int WINS_StringToAddr( char *string, struct sockaddr_s *addr ){ addr->sa_family = AF_INET; ( (struct sockaddr_in *)addr )->sin_addr.s_addr = htonl( ipaddr ); - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)hp ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)hp ); return 0; } //end of the function WINS_StringToAddr //=========================================================================== @@ -694,7 +694,7 @@ int WINS_GetAddrFromName( char *name, struct sockaddr_s *addr ){ } addr->sa_family = AF_INET; - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)net_hostport ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)net_hostport ); ( (struct sockaddr_in *)addr )->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0]; return 0; @@ -736,6 +736,6 @@ int WINS_GetSocketPort( struct sockaddr_s *addr ){ // Changes Globals: - //=========================================================================== int WINS_SetSocketPort( struct sockaddr_s *addr, int port ){ - ( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)port ); + ( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)port ); return 0; } //end of the function WINS_SetSocketPort diff --git a/tools/mbspc/mbspc/bspc.c b/tools/mbspc/mbspc/bspc.c index 9f0d0315..ee7b9ed1 100644 --- a/tools/mbspc/mbspc/bspc.c +++ b/tools/mbspc/mbspc/bspc.c @@ -407,7 +407,7 @@ void CreateAASFilesForAllBSPFiles(char *quakepath) stat(foldername, &statbuf); #endif //if it is a folder - if (statbuf.st_mode & S_IFDIR) + if ( S_ISDIR( statbuf.st_mode ) != 0 ) { // AppendPathSeperator(foldername, sizeof(foldername)); diff --git a/tools/mbspc/mbspc/l_qfiles.c b/tools/mbspc/mbspc/l_qfiles.c index 6ee117b8..a0243d6e 100644 --- a/tools/mbspc/mbspc/l_qfiles.c +++ b/tools/mbspc/mbspc/l_qfiles.c @@ -441,7 +441,7 @@ quakefile_t *FindQuakeFilesWithPakFilter(char *pakfilter, char *filter) stat(pakfile, &statbuf); #endif //if the file with .pak or .pk3 is a folder - if (statbuf.st_mode & S_IFDIR) + if ( S_ISDIR( statbuf.st_mode ) != 0 ) { strcpy(filename, pakfilter); AppendPathSeperator(filename, _MAX_PATH); diff --git a/tools/quake2/common/path_init.c b/tools/quake2/common/path_init.c index 324f8f81..1a0ba0dc 100644 --- a/tools/quake2/common/path_init.c +++ b/tools/quake2/common/path_init.c @@ -36,6 +36,7 @@ #include #include #include + #include #endif diff --git a/tools/quake2/qdata/qdata.c b/tools/quake2/qdata/qdata.c index 85516a24..07168a9a 100644 --- a/tools/quake2/qdata/qdata.c +++ b/tools/quake2/qdata/qdata.c @@ -275,7 +275,7 @@ void PackDirectory_r( char *dir ){ if ( stat( dirstring, &st ) == -1 ) { Error( "fstating %s", pf->name ); } - if ( st.st_mode & S_IFDIR ) { // directory + if ( S_ISDIR( st.st_mode ) != 0 ) { // directory PackDirectory_r( fullname ); continue; } diff --git a/tools/quake2/qdata_heretic2/common/path_init.c b/tools/quake2/qdata_heretic2/common/path_init.c index c0d9cf74..d243d060 100644 --- a/tools/quake2/qdata_heretic2/common/path_init.c +++ b/tools/quake2/qdata_heretic2/common/path_init.c @@ -37,6 +37,7 @@ #include #include #include + #include #endif diff --git a/tools/quake2/qdata_heretic2/qdata.c b/tools/quake2/qdata_heretic2/qdata.c index c0b42359..aa5ef6e5 100644 --- a/tools/quake2/qdata_heretic2/qdata.c +++ b/tools/quake2/qdata_heretic2/qdata.c @@ -265,7 +265,7 @@ void PackDirectory_r( char *dir ){ if ( stat( dirstring, &st ) == -1 ) { Error( "fstating %s", pf->name ); } - if ( st.st_mode & S_IFDIR ) { // directory + if ( S_ISDIR( st.st_mode ) != 0 ) { // directory PackDirectory_r( fullname ); continue; } diff --git a/tools/quake3/common/vfs.h b/tools/quake3/common/vfs.h index 4e18063f..c3835587 100644 --- a/tools/quake3/common/vfs.h +++ b/tools/quake3/common/vfs.h @@ -36,6 +36,7 @@ #if defined ( __linux__ ) || defined ( __APPLE__ ) #include #include +#include #else #include #include diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c index 1a6d87b0..a8e9c4eb 100644 --- a/tools/quake3/q3data/q3data.c +++ b/tools/quake3/q3data/q3data.c @@ -350,7 +350,7 @@ void PackDirectory_r( char *dir ){ if ( stat( dirstring, &st ) == -1 ) { Error( "fstating %s", pf->name ); } - if ( st.st_mode & S_IFDIR ) { // directory + if ( S_ISDIR( st.st_mode ) != 0 ) { // directory PackDirectory_r( fullname ); continue; }