summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-03-08 11:49:25 +0100
committerAnatol Belski <ab@php.net>2018-03-08 11:49:25 +0100
commitd1ed6b1b156905c5f84d9dd8cabd965106036572 (patch)
tree97824c1b109b2c7792b037ab93dd21669b0e7668
parent2d660dd63059a8e0f7a8d080173efbf74fa2adc8 (diff)
parent34b9f9dedf78a01844074d595e483371a28dfdd3 (diff)
downloadphp-git-d1ed6b1b156905c5f84d9dd8cabd965106036572.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Disable PGO for phpdbg
-rw-r--r--sapi/phpdbg/config.w324
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32
index 2d907ee697..e69ca455f7 100644
--- a/sapi/phpdbg/config.w32
+++ b/sapi/phpdbg/config.w32
@@ -11,6 +11,10 @@ PHPDBG_DLL='php' + PHP_VERSION + 'phpdbg.dll';
PHPDBG_EXE='phpdbg.exe';
PHPDBG_CFLAGS='/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1';
+var PHP_PHPDBG_PGO = false;
+var PHP_PHPDBG_WEBHELPER_PGO = false;
+var PHP_PHPDBGS_PGO = false;
+
if (PHP_PHPDBG == "yes") {
SAPI('phpdbg', PHPDBG_SOURCES, PHPDBG_EXE, PHPDBG_CFLAGS);
ADD_FLAG("LIBS_PHPDBG", "ws2_32.lib user32.lib");