Skip to content

Commit a82d864

Browse files
petkpetk
authored
Replace WIN32 conditions with _WIN32 or PHP_WIN32 (#14462)
* Replace WIN32 conditions with _WIN32 or PHP_WIN32 WIN32 is defined by the SDK and not defined all the time on Windows by compilers or the environment. _WIN32 is defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64. Otherwise, undefined. This syncs these usages one step further. Upstream libgd has replaced WIN32 with _WIN32 via libgd/libgd@c60d9fe PHP_WIN32 is added to ext/sockets/sockets.stub.php as done in other *.stub.php files at this point. * Use PHP_WIN32 in ext/random * Use PHP_WIN32 in ext/sockets * Use _WIN32 in xxhash.h as done upstream See Cyan4973/xxHash#931 * Update end comment with PHP_WIN32
1 parent bcecbb5 commit a82d864

File tree

11 files changed

+62
-62
lines changed

11 files changed

+62
-62
lines changed

‎TSRM/TSRM.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef TSRM_H
1414
#define TSRM_H
1515

16-
#if !defined(__CYGWIN__) && defined(WIN32)
16+
#if !defined(__CYGWIN__) && defined(_WIN32)
1717
# define TSRM_WIN32
1818
# include "Zend/zend_config.w32.h"
1919
#else

‎ext/gd/libgd/gd.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern "C" {
2121
/* default fontpath for netware systems */
2222
#define DEFAULT_FONTPATH "sys:/java/nwgfx/lib/x11/fonts/ttf;."
2323
#define PATHSEPARATOR ";"
24-
#elif defined(WIN32)
24+
#elif defined(_WIN32)
2525
/* default fontpath for windows systems */
2626
#define DEFAULT_FONTPATH "c:\\winnt\\fonts;c:\\windows\\fonts;."
2727
#define PATHSEPARATOR ";"

‎ext/gd/libgd/gdft.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222
#endif
2323

24-
#ifdef WIN32
24+
#ifdef _WIN32
2525
#define access _access
2626
#ifndef R_OK
2727
#define R_OK 2

‎ext/hash/xxhash/xxhash.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ extern "C" {
229229
*/
230230
/* specific declaration modes for Windows */
231231
#if !defined(XXH_INLINE_ALL) && !defined(XXH_PRIVATE_API)
232-
# if defined(WIN32) && defined(_MSC_VER) && (defined(XXH_IMPORT) || defined(XXH_EXPORT))
232+
# if defined(_WIN32) && defined(_MSC_VER) && (defined(XXH_IMPORT) || defined(XXH_EXPORT))
233233
# ifdef XXH_EXPORT
234234
# define XXH_PUBLIC_API __declspec(dllexport)
235235
# elif XXH_IMPORT

‎ext/mbstring/libmbfl/mbfl/mbfl_defs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#define SIZE_MAX ((size_t)~0)
4444
#endif
4545

46-
#ifdef WIN32
46+
#ifdef _WIN32
4747
#ifdef MBFL_DLL_EXPORT
4848
#define MBFLAPI __declspec(dllexport)
4949
#else
@@ -55,6 +55,6 @@
5555
#else
5656
#define MBFLAPI
5757
#endif /* defined(__GNUC__) && __GNUC__ >= 4 */
58-
#endif /* WIN32 */
58+
#endif /* _WIN32 */
5959

6060
#endif /* MBFL_DEFS_H */

‎ext/random/random.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ PHPAPI uint64_t php_random_generate_fallback_seed(void)
635635
/* Various PIDs. */
636636
pid = getpid();
637637
fallback_seed_add(&c, &pid, sizeof(pid));
638-
#ifndef WIN32
638+
#ifndef PHP_WIN32
639639
pid = getppid();
640640
fallback_seed_add(&c, &pid, sizeof(pid));
641641
#endif

‎ext/sockets/php_sockets.h‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -153,31 +153,31 @@ PHP_SOCKETS_API bool socket_import_file_descriptor(PHP_SOCKET socket, php_socket
153153
#define PHP_NORMAL_READ 0x0001
154154
#define PHP_BINARY_READ 0x0002
155155

156-
#ifdef WIN32
156+
#ifdef PHP_WIN32
157157
#define PHP_SOCKET_EINTR WSAEINTR
158158
#elif defined(EINTR)
159159
#define PHP_SOCKET_EINTR EINTR
160160
#endif
161161

162-
#ifdef WIN32
162+
#ifdef PHP_WIN32
163163
#define PHP_SOCKET_EBADF WSAEBADF
164164
#elif defined(EBADF)
165165
#define PHP_SOCKET_EBADF EBADF
166166
#endif
167167

168-
#ifdef WIN32
168+
#ifdef PHP_WIN32
169169
#define PHP_SOCKET_EACCES WSAEACCES
170170
#elif defined(EACCES)
171171
#define PHP_SOCKET_EACCES EACCES
172172
#endif
173173

174-
#ifdef WIN32
174+
#ifdef PHP_WIN32
175175
#define PHP_SOCKET_EFAULT WSAEFAULT
176176
#elif defined(EFAULT)
177177
#define PHP_SOCKET_EFAULT EFAULT
178178
#endif
179179

180-
#ifdef WIN32
180+
#ifdef PHP_WIN32
181181
#define PHP_SOCKET_EINVAL WSAEINVAL
182182
#elif defined(EINVAL)
183183
#define PHP_SOCKET_EINVAL EINVAL
@@ -187,217 +187,217 @@ PHP_SOCKETS_API bool socket_import_file_descriptor(PHP_SOCKET socket, php_socket
187187
#define PHP_SOCKET_ENFILE ENFILE
188188
#endif
189189

190-
#ifdef WIN32
190+
#ifdef PHP_WIN32
191191
#define PHP_SOCKET_EMFILE WSAEMFILE
192192
#elif defined(EMFILE)
193193
#define PHP_SOCKET_EMFILE EMFILE
194194
#endif
195195

196-
#ifdef WIN32
196+
#ifdef PHP_WIN32
197197
#define PHP_SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
198198
#elif defined(EWOULDBLOCK)
199199
#define PHP_SOCKET_EWOULDBLOCK EWOULDBLOCK
200200
#endif
201201

202-
#ifdef WIN32
202+
#ifdef PHP_WIN32
203203
#define PHP_SOCKET_EINPROGRESS WSAEINPROGRESS
204204
#elif defined(EINPROGRESS)
205205
#define PHP_SOCKET_EINPROGRESS EINPROGRESS
206206
#endif
207207

208-
#ifdef WIN32
208+
#ifdef PHP_WIN32
209209
#define PHP_SOCKET_EALREADY WSAEALREADY
210210
#elif defined(EALREADY)
211211
#define PHP_SOCKET_EALREADY EALREADY
212212
#endif
213213

214-
#ifdef WIN32
214+
#ifdef PHP_WIN32
215215
#define PHP_SOCKET_ENOTSOCK WSAENOTSOCK
216216
#elif defined(ENOTSOCK)
217217
#define PHP_SOCKET_ENOTSOCK ENOTSOCK
218218
#endif
219219

220-
#ifdef WIN32
220+
#ifdef PHP_WIN32
221221
#define PHP_SOCKET_EDESTADDRREQ WSAEDESTADDRREQ
222222
#elif defined(EDESTADDRREQ)
223223
#define PHP_SOCKET_EDESTADDRREQ EDESTADDRREQ
224224
#endif
225225

226-
#ifdef WIN32
226+
#ifdef PHP_WIN32
227227
#define PHP_SOCKET_EMSGSIZE WSAEMSGSIZE
228228
#elif defined(EMSGSIZE)
229229
#define PHP_SOCKET_EMSGSIZE EMSGSIZE
230230
#endif
231231

232-
#ifdef WIN32
232+
#ifdef PHP_WIN32
233233
#define PHP_SOCKET_EPROTOTYPE WSAEPROTOTYPE
234234
#elif defined(EPROTOTYPE)
235235
#define PHP_SOCKET_EPROTOTYPE EPROTOTYPE
236236
#endif
237237

238-
#ifdef WIN32
238+
#ifdef PHP_WIN32
239239
#define PHP_SOCKET_ENOPROTOOPT WSAENOPROTOOPT
240240
#elif defined(ENOPROTOOPT)
241241
#define PHP_SOCKET_ENOPROTOOPT ENOPROTOOPT
242242
#endif
243243

244-
#ifdef WIN32
244+
#ifdef PHP_WIN32
245245
#define PHP_SOCKET_EPROTONOSUPPORT WSAEPROTONOSUPPORT
246246
#elif defined(EPROTONOSUPPORT)
247247
#define PHP_SOCKET_EPROTONOSUPPORT EPROTONOSUPPORT
248248
#endif
249249

250-
#ifdef WIN32
250+
#ifdef PHP_WIN32
251251
#define PHP_SOCKET_ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
252252
#elif defined(ESOCKTNOSUPPORT)
253253
#define PHP_SOCKET_ESOCKTNOSUPPORT ESOCKTNOSUPPORT
254254
#endif
255255

256-
#ifdef WIN32
256+
#ifdef PHP_WIN32
257257
#define PHP_SOCKET_EOPNOTSUPP WSAEOPNOTSUPP
258258
#elif defined(EOPNOTSUPP)
259259
#define PHP_SOCKET_EOPNOTSUPP EOPNOTSUPP
260260
#endif
261261

262-
#ifdef WIN32
262+
#ifdef PHP_WIN32
263263
#define PHP_SOCKET_EPFNOSUPPORT WSAEPFNOSUPPORT
264264
#elif defined(EPFNOSUPPORT)
265265
#define PHP_SOCKET_EPFNOSUPPORT EPFNOSUPPORT
266266
#endif
267267

268-
#ifdef WIN32
268+
#ifdef PHP_WIN32
269269
#define PHP_SOCKET_EAFNOSUPPORT WSAEAFNOSUPPORT
270270
#elif defined(EAFNOSUPPORT)
271271
#define PHP_SOCKET_EAFNOSUPPORT EAFNOSUPPORT
272272
#endif
273273

274-
#ifdef WIN32
274+
#ifdef PHP_WIN32
275275
#define PHP_SOCKET_EADDRINUSE WSAEADDRINUSE
276276
#elif defined(EADDRINUSE)
277277
#define PHP_SOCKET_EADDRINUSE EADDRINUSE
278278
#endif
279279

280-
#ifdef WIN32
280+
#ifdef PHP_WIN32
281281
#define PHP_SOCKET_EADDRNOTAVAIL WSAEADDRNOTAVAIL
282282
#elif defined(EADDRNOTAVAIL)
283283
#define PHP_SOCKET_EADDRNOTAVAIL EADDRNOTAVAIL
284284
#endif
285285

286-
#ifdef WIN32
286+
#ifdef PHP_WIN32
287287
#define PHP_SOCKET_ENETDOWN WSAENETDOWN
288288
#elif defined(ENETDOWN)
289289
#define PHP_SOCKET_ENETDOWN ENETDOWN
290290
#endif
291291

292-
#ifdef WIN32
292+
#ifdef PHP_WIN32
293293
#define PHP_SOCKET_ENETUNREACH WSAENETUNREACH
294294
#elif defined(ENETUNREACH)
295295
#define PHP_SOCKET_ENETUNREACH ENETUNREACH
296296
#endif
297297

298-
#ifdef WIN32
298+
#ifdef PHP_WIN32
299299
#define PHP_SOCKET_ENETRESET WSAENETRESET
300300
#elif defined(ENETRESET)
301301
#define PHP_SOCKET_ENETRESET ENETRESET
302302
#endif
303303

304-
#ifdef WIN32
304+
#ifdef PHP_WIN32
305305
#define PHP_SOCKET_ECONNABORTED WSAECONNABORTED
306306
#elif defined(ECONNABORTED)
307307
#define PHP_SOCKET_ECONNABORTED ECONNABORTED
308308
#endif
309309

310-
#ifdef WIN32
310+
#ifdef PHP_WIN32
311311
#define PHP_SOCKET_ECONNRESET WSAECONNRESET
312312
#elif defined(ECONNRESET)
313313
#define PHP_SOCKET_ECONNRESET ECONNRESET
314314
#endif
315315

316-
#ifdef WIN32
316+
#ifdef PHP_WIN32
317317
#define PHP_SOCKET_ENOBUFS WSAENOBUFS
318318
#elif defined(ENOBUFS)
319319
#define PHP_SOCKET_ENOBUFS ENOBUFS
320320
#endif
321321

322-
#ifdef WIN32
322+
#ifdef PHP_WIN32
323323
#define PHP_SOCKET_EISCONN WSAEISCONN
324324
#elif defined(EISCONN)
325325
#define PHP_SOCKET_EISCONN EISCONN
326326
#endif
327327

328-
#ifdef WIN32
328+
#ifdef PHP_WIN32
329329
#define PHP_SOCKET_ENOTCONN WSAENOTCONN
330330
#elif defined(ENOTCONN)
331331
#define PHP_SOCKET_ENOTCONN ENOTCONN
332332
#endif
333333

334-
#ifdef WIN32
334+
#ifdef PHP_WIN32
335335
#define PHP_SOCKET_ESHUTDOWN WSAESHUTDOWN
336336
#elif defined(ESHUTDOWN)
337337
#define PHP_SOCKET_ESHUTDOWN ESHUTDOWN
338338
#endif
339339

340-
#ifdef WIN32
340+
#ifdef PHP_WIN32
341341
#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
342342
#elif defined(ETOOMANYREFS)
343343
#define PHP_SOCKET_ETOOMANYREFS ETOOMANYREFS
344344
#endif
345345

346-
#ifdef WIN32
346+
#ifdef PHP_WIN32
347347
#define PHP_SOCKET_ETIMEDOUT WSAETIMEDOUT
348348
#elif defined(ETIMEDOUT)
349349
#define PHP_SOCKET_ETIMEDOUT ETIMEDOUT
350350
#endif
351351

352-
#ifdef WIN32
352+
#ifdef PHP_WIN32
353353
#define PHP_SOCKET_ECONNREFUSED WSAECONNREFUSED
354354
#elif defined(ECONNREFUSED)
355355
#define PHP_SOCKET_ECONNREFUSED ECONNREFUSED
356356
#endif
357357

358-
#ifdef WIN32
358+
#ifdef PHP_WIN32
359359
#define PHP_SOCKET_ELOOP WSAELOOP
360360
#elif defined(ELOOP)
361361
#define PHP_SOCKET_ELOOP ELOOP
362362
#endif
363363

364-
#ifdef WIN32
364+
#ifdef PHP_WIN32
365365
#define PHP_SOCKET_ENAMETOOLONG WSAENAMETOOLONG
366366
#elif defined(ENAMETOOLONG)
367367
#define PHP_SOCKET_ENAMETOOLONG ENAMETOOLONG
368368
#endif
369369

370-
#ifdef WIN32
370+
#ifdef PHP_WIN32
371371
#define PHP_SOCKET_EHOSTDOWN WSAEHOSTDOWN
372372
#elif defined(EHOSTDOWN)
373373
#define PHP_SOCKET_EHOSTDOWN EHOSTDOWN
374374
#endif
375375

376-
#ifdef WIN32
376+
#ifdef PHP_WIN32
377377
#define PHP_SOCKET_EHOSTUNREACH WSAEHOSTUNREACH
378378
#elif defined(EHOSTUNREACH)
379379
#define PHP_SOCKET_EHOSTUNREACH EHOSTUNREACH
380380
#endif
381381

382-
#ifdef WIN32
382+
#ifdef PHP_WIN32
383383
#define PHP_SOCKET_ENOTEMPTY WSAENOTEMPTY
384384
#elif defined(ENOTEMPTY)
385385
#define PHP_SOCKET_ENOTEMPTY ENOTEMPTY
386386
#endif
387387

388-
#ifdef WIN32
388+
#ifdef PHP_WIN32
389389
#define PHP_SOCKET_EUSERS WSAEUSERS
390390
#elif defined(EUSERS)
391391
#define PHP_SOCKET_EUSERS EUSERS
392392
#endif
393393

394-
#ifdef WIN32
394+
#ifdef PHP_WIN32
395395
#define PHP_SOCKET_EDQUOT WSAEDQUOT
396396
#elif defined(EDQUOT)
397397
#define PHP_SOCKET_EDQUOT EDQUOT
398398
#endif
399399

400-
#ifdef WIN32
400+
#ifdef PHP_WIN32
401401
#define PHP_SOCKET_EREMOTE WSAEREMOTE
402402
#elif defined(EREMOTE)
403403
#define PHP_SOCKET_EREMOTE EREMOTE

‎ext/sockets/sockets.stub.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@
15111511
const SOCKET_EMEDIUMTYPE = UNKNOWN;
15121512
#endif
15131513

1514-
#ifdef WIN32
1514+
#ifdef PHP_WIN32
15151515
/**
15161516
* @var int
15171517
* @cvalue WSAESTALE

0 commit comments

Comments
 (0)