Skip to content

Commit c668994

Browse files
bobtistabobtista
committed
refactor(build): use _WIN32 instead of _WINDOWS for Windows detection
1 parent b7d7238 commit c668994

File tree

11 files changed

+81
-57
lines changed

11 files changed

+81
-57
lines changed

‎Core/GameEngine/Include/GameNetwork/udp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <errno.h>
2929
#endif
3030

31-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
31+
#ifdef _WIN32
3232
#include <winsock.h>
3333
#include <io.h>
3434
//#define close _close

‎Core/GameEngine/Source/GameNetwork/udp.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
154154
addr.sin_port=Port;
155155
addr.sin_addr.s_addr=IP;
156156
fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
157-
#ifdef _WINDOWS
157+
#ifdef _WIN32
158158
if (fd==SOCKET_ERROR)
159159
fd=-1;
160160
#endif
@@ -163,7 +163,7 @@ Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
163163

164164
retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
165165

166-
#ifdef _WINDOWS
166+
#ifdef _WIN32
167167
if (retval==SOCKET_ERROR)
168168
{
169169
retval=-1;
@@ -201,7 +201,7 @@ Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
201201
// private function
202202
Int UDP::SetBlocking(Int block)
203203
{
204-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
204+
#ifdef _WIN32
205205
unsigned long flag=1;
206206
if (block)
207207
flag=0;
@@ -244,7 +244,7 @@ Int UDP::Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedS
244244

245245
ClearStatus();
246246
retval=sendto(fd,(const char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
247-
#ifdef _WINDOWS
247+
#ifdef _WIN32
248248
if (retval==SOCKET_ERROR)
249249
{
250250
retval=-1;
@@ -267,7 +267,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
267267
if (from!=NULL)
268268
{
269269
retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
270-
#ifdef _WINDOWS
270+
#ifdef _WIN32
271271
if (retval == SOCKET_ERROR)
272272
{
273273
if (WSAGetLastError() != WSAEWOULDBLOCK)
@@ -288,7 +288,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
288288
else
289289
{
290290
retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
291-
#ifdef _WINDOWS
291+
#ifdef _WIN32
292292
if (retval==SOCKET_ERROR)
293293
{
294294
if (WSAGetLastError() != WSAEWOULDBLOCK)
@@ -312,7 +312,7 @@ Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
312312

313313
void UDP::ClearStatus(void)
314314
{
315-
#ifndef _WINDOWS
315+
#ifndef _WIN32
316316
errno=0;
317317
#endif
318318

@@ -322,7 +322,7 @@ void UDP::ClearStatus(void)
322322
UDP::sockStat UDP::GetStatus(void)
323323
{
324324
Int status = m_lastError;
325-
#ifdef _WINDOWS
325+
#ifdef _WIN32
326326
//int status=WSAGetLastError();
327327
switch (status) {
328328
case NO_ERROR:

‎Core/Tools/mangler/wnet/tcp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ while (1)
9999
#include "tcp.h"
100100
#include <stdarg.h>
101101

102-
#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(WIN32)
102+
#ifndef _WIN32
103103
#include <errno.h>
104104
#define closesocket close
105105
#endif
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
170170
if (whichFD==0)
171171
whichFD=fd;
172172

173-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
173+
#ifdef _WIN32
174174
unsigned long flag=1;
175175
if (block)
176176
flag=0;
@@ -219,7 +219,7 @@ sint32 TCP::Write(const uint8 *msg,uint32 len,sint32 whichFD)
219219
}
220220
SetBlocking(TRUE,whichFD);
221221
retval=send(whichFD,(const char *)msg,len,0);
222-
#ifdef _WINDOWS
222+
#ifdef _WIN32
223223
if (retval==SOCKET_ERROR)
224224
retval=-1;
225225
#endif
@@ -241,7 +241,7 @@ sint32 TCP::WriteNB(uint8 *msg,uint32 len,sint32 whichFD)
241241
whichFD=fd;
242242
}
243243
retval=send(whichFD,(const char *)msg,len,0);
244-
#ifdef _WINDOWS
244+
#ifdef _WIN32
245245
if (retval==SOCKET_ERROR)
246246
retval=-1;
247247
#endif
@@ -942,7 +942,7 @@ bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
942942
}
943943

944944
retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
945-
#ifdef _WINDOWS
945+
#ifdef _WIN32
946946
if (retval==SOCKET_ERROR)
947947
retval=-1;
948948
#endif
@@ -1013,7 +1013,7 @@ bit8 TCP::Connect(uint32 IP,uint16 Port)
10131013
result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
10141014
status=GetStatus();
10151015

1016-
#ifdef _WINDOWS
1016+
#ifdef _WIN32
10171017
if (result==SOCKET_ERROR)
10181018
result=-1;
10191019
#endif
@@ -1107,7 +1107,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11071107
connectErrno=errno;
11081108
status=GetStatus();
11091109

1110-
#ifdef _WINDOWS
1110+
#ifdef _WIN32
11111111
if (result==SOCKET_ERROR)
11121112
{
11131113
DBGMSG("Socket error 1 " << status);
@@ -1124,7 +1124,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11241124
ClearStatus();
11251125
result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
11261126
status=GetStatus();
1127-
#ifdef _WINDOWS
1127+
#ifdef _WIN32
11281128
if (result==SOCKET_ERROR)
11291129
{
11301130
DBGMSG("Socket error 2 " << status);
@@ -1159,14 +1159,14 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11591159

11601160
void TCP::ClearStatus(void)
11611161
{
1162-
#ifndef _WINDOWS
1162+
#ifndef _WIN32
11631163
errno=0;
11641164
#endif
11651165
}
11661166

11671167
int TCP::GetStatus(void)
11681168
{
1169-
#ifdef _WINDOWS
1169+
#ifdef _WIN32
11701170
int status=WSAGetLastError();
11711171
if (status==0) return(OK);
11721172
else if (status==WSAEINTR) return(INTR);

‎Core/Tools/mangler/wnet/tcp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TCP Neal Kettler neal@westwood.com
3030
#include <string.h>
3131
#include <assert.h>
3232

33-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
33+
#ifdef _WIN32
3434

3535
#include <winsock.h>
3636
#include <io.h>

‎Core/Tools/mangler/wnet/udp.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
6060
addr.sin_port=Port;
6161
addr.sin_addr.s_addr=IP;
6262
fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
63-
#ifdef _WINDOWS
63+
#ifdef _WIN32
6464
if (fd==SOCKET_ERROR)
6565
fd=-1;
6666
#endif
@@ -69,7 +69,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
6969

7070
retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
7171

72-
#ifdef _WINDOWS
72+
#ifdef _WIN32
7373
if (retval==SOCKET_ERROR)
7474
retval=-1;
7575
#endif
@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)
104104
// private function
105105
sint32 UDP::SetBlocking(bit8 block)
106106
{
107-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
107+
#ifdef _WIN32
108108
unsigned long flag=1;
109109
if (block)
110110
flag=0;
@@ -145,7 +145,7 @@ sint32 UDP::Write(uint8 *msg,uint32 len,uint32 IP,uint16 port)
145145

146146
ClearStatus();
147147
retval=sendto(fd,(char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
148-
#ifdef _WINDOWS
148+
#ifdef _WIN32
149149
if (retval==SOCKET_ERROR)
150150
retval=-1;
151151
#endif
@@ -161,15 +161,15 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
161161
if (from!=NULL)
162162
{
163163
retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
164-
#ifdef _WINDOWS
164+
#ifdef _WIN32
165165
if (retval==SOCKET_ERROR)
166166
retval=-1;
167167
#endif
168168
}
169169
else
170170
{
171171
retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
172-
#ifdef _WINDOWS
172+
#ifdef _WIN32
173173
if (retval==SOCKET_ERROR)
174174
retval=-1;
175175
#endif
@@ -180,14 +180,14 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
180180

181181
void UDP::ClearStatus(void)
182182
{
183-
#ifndef _WINDOWS
183+
#ifndef _WIN32
184184
errno=0;
185185
#endif
186186
}
187187

188188
UDP::sockStat UDP::GetStatus(void)
189189
{
190-
#ifdef _WINDOWS
190+
#ifdef _WIN32
191191
int status=WSAGetLastError();
192192
if (status==0) return(OK);
193193
else if (status==WSAEINTR) return(INTR);
@@ -310,7 +310,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
310310

311311
bit8 UDP::SetInputBuffer(uint32 bytes)
312312
{
313-
#ifndef _WINDOWS
313+
#ifndef _WIN32
314314
int retval,arg=bytes;
315315

316316
retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -328,7 +328,7 @@ bit8 UDP::SetInputBuffer(uint32 bytes)
328328

329329
bit8 UDP::SetOutputBuffer(uint32 bytes)
330330
{
331-
#ifndef _WINDOWS
331+
#ifndef _WIN32
332332
int retval,arg=bytes;
333333

334334
retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
@@ -346,7 +346,7 @@ bit8 UDP::SetOutputBuffer(uint32 bytes)
346346

347347
int UDP::GetInputBuffer(void)
348348
{
349-
#ifndef _WINDOWS
349+
#ifndef _WIN32
350350
int retval,arg=0,len=sizeof(int);
351351

352352
retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -360,7 +360,7 @@ int UDP::GetInputBuffer(void)
360360

361361
int UDP::GetOutputBuffer(void)
362362
{
363-
#ifndef _WINDOWS
363+
#ifndef _WIN32
364364
int retval,arg=0,len=sizeof(int);
365365

366366
retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,

‎Core/Tools/mangler/wnet/udp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <errno.h>
2525
#include <string.h>
2626

27-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
27+
#ifdef _WIN32
2828
#include <winsock.h>
2929
#include <io.h>
3030
#define close _close

‎Core/Tools/matchbot/wnet/tcp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ while (1)
9999
#include "tcp.h"
100100
#include <stdarg.h>
101101

102-
#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(WIN32)
102+
#ifndef _WIN32
103103
#include <errno.h>
104104
#define closesocket close
105105
#endif
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
170170
if (whichFD==0)
171171
whichFD=fd;
172172

173-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
173+
#ifdef _WIN32
174174
unsigned long flag=1;
175175
if (block)
176176
flag=0;
@@ -219,7 +219,7 @@ sint32 TCP::Write(const uint8 *msg,uint32 len,sint32 whichFD)
219219
}
220220
SetBlocking(TRUE,whichFD);
221221
retval=send(whichFD,(const char *)msg,len,0);
222-
#ifdef _WINDOWS
222+
#ifdef _WIN32
223223
if (retval==SOCKET_ERROR)
224224
retval=-1;
225225
#endif
@@ -241,7 +241,7 @@ sint32 TCP::WriteNB(uint8 *msg,uint32 len,sint32 whichFD)
241241
whichFD=fd;
242242
}
243243
retval=send(whichFD,(const char *)msg,len,0);
244-
#ifdef _WINDOWS
244+
#ifdef _WIN32
245245
if (retval==SOCKET_ERROR)
246246
retval=-1;
247247
#endif
@@ -942,7 +942,7 @@ bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
942942
}
943943

944944
retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
945-
#ifdef _WINDOWS
945+
#ifdef _WIN32
946946
if (retval==SOCKET_ERROR)
947947
retval=-1;
948948
#endif
@@ -1013,7 +1013,7 @@ bit8 TCP::Connect(uint32 IP,uint16 Port)
10131013
result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
10141014
status=GetStatus();
10151015

1016-
#ifdef _WINDOWS
1016+
#ifdef _WIN32
10171017
if (result==SOCKET_ERROR)
10181018
result=-1;
10191019
#endif
@@ -1107,7 +1107,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11071107
connectErrno=errno;
11081108
status=GetStatus();
11091109

1110-
#ifdef _WINDOWS
1110+
#ifdef _WIN32
11111111
if (result==SOCKET_ERROR)
11121112
{
11131113
DBGMSG("Socket error 1 " << status);
@@ -1124,7 +1124,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11241124
ClearStatus();
11251125
result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
11261126
status=GetStatus();
1127-
#ifdef _WINDOWS
1127+
#ifdef _WIN32
11281128
if (result==SOCKET_ERROR)
11291129
{
11301130
DBGMSG("Socket error 2 " << status);
@@ -1159,14 +1159,14 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
11591159

11601160
void TCP::ClearStatus(void)
11611161
{
1162-
#ifndef _WINDOWS
1162+
#ifndef _WIN32
11631163
errno=0;
11641164
#endif
11651165
}
11661166

11671167
int TCP::GetStatus(void)
11681168
{
1169-
#ifdef _WINDOWS
1169+
#ifdef _WIN32
11701170
int status=WSAGetLastError();
11711171
if (status==0) return(OK);
11721172
else if (status==WSAEINTR) return(INTR);

‎Core/Tools/matchbot/wnet/tcp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TCP Neal Kettler neal@westwood.com
3030
#include <string.h>
3131
#include <assert.h>
3232

33-
#if defined(_WINDOWS) || defined(_WIN32) || defined(WIN32)
33+
#ifdef _WIN32
3434

3535
#include <winsock.h>
3636
#include <io.h>

0 commit comments

Comments
 (0)