archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace WIN32 conditions with _WIN32 or PHP_WIN32 (#14462)

Browse source 
* 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
c60d9fe577

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 https://github.com/Cyan4973/xxHash/pull/931

* Update end comment with PHP_WIN32
This commit is contained in:
Peter Kokot 2024-06-10 21:59:41 +02:00 • committed by GitHub
parent bcecbb59d3
commit a82d86479c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/random/random.c
View file

@ -635,7 +635,7 @@ PHPAPI uint64_t php_random_generate_fallback_seed(void)
/* Various PIDs. */
pid = getpid();
fallback_seed_add(&c, &pid, sizeof(pid));
#ifndef WIN32
#ifndef PHP_WIN32
pid = getppid();
fallback_seed_add(&c, &pid, sizeof(pid));
#endif