Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
This commit is contained in:
Christoph M. Becker 2020-07-23 15:43:02 +02:00
commit 4293dd5d34

View File

@ -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@"