summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-07-23 15:43:02 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-07-23 15:43:02 +0200
commit4293dd5d344dd7277fc3af5aa6c0da5ea327f3b6 (patch)
tree6204575f575403e0e6329cdd93aa83a8a8f9c608 /win32
parent96a1b409df21db178a37ba09ae2ed27714443565 (diff)
parent3deb6b555a6bf3578116f328a132644888ff8b68 (diff)
downloadphp-git-4293dd5d344dd7277fc3af5aa6c0da5ea327f3b6.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
Diffstat (limited to 'win32')
-rw-r--r--win32/build/config.w32.h.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 6c92ca4cbf..2167b1297b 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -9,7 +9,7 @@
#define NTDDI_VERSION 0x06010000
/* Default PHP / PEAR directories */
-#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot")?getenv("SystemRoot"):"")
+#define PHP_CONFIG_FILE_PATH ""
#define CONFIGURATION_FILE_PATH "php.ini"
#define PEAR_INSTALLDIR "@PREFIX@\\pear"
#define PHP_BINDIR "@PREFIX@"