archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Guard config.w32.h from multiple inclusion (GH-17021)

Browse source 
Besides that is generally good practice to avoid macro redefinitions
(and symbol redeclarations), and we're doing this on POSIX platforms
anyway, there is a particular issue regarding phpize builds, where
config.w32.h actually includes config.pickle.h.  The latter overrides
some macro definitions (e.g. `PHP_BUILD_SYSTEM`) to define the proper
values, but if config.w32.h is included multiple times, different macro
definitions eventually raise C4005 compiler warnings[1], which break
builds with `/WX /W1` enabled.

[1] <https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4005>
This commit is contained in:
Christoph M. Becker 2024-12-08 23:42:34 +01:00 • committed by GitHub
parent 751eabb796
commit c0385e978a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
win32/build/confutils.js
View file

@ -2272,6 +2272,10 @@ function generate_config_h()
outfile = FSO.CreateTextFile("main/config.w32.h", true);
outfile.WriteLine("#ifndef CONFIG_W32_H");
outfile.WriteLine("#define CONFIG_W32_H");
outfile.WriteBlankLines(1);
indata = indata.replace(new RegExp("@PREFIX@", "g"), prefix);
outfile.Write(indata);
@ -2319,6 +2323,8 @@ function generate_config_h()
outfile.WriteLine("#if __has_include(\"main/config.pickle.h\")");
outfile.WriteLine("#include \"main/config.pickle.h\"");
outfile.WriteLine("#endif");
outfile.WriteBlankLines(1);
outfile.WriteLine("#endif /* CONFIG_W32_H */");
outfile.Close();
}