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

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

Browse source 
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
This commit is contained in:
Anatol Belski 2014-04-26 00:15:32 +02:00
commit a10dc3aa4f
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sapi/phpdbg/config.w32
View file

@ -6,15 +6,14 @@ PHPDBG_DLL='php' + PHP_VERSION + 'phpdbg.dll';
PHPDBG_EXE='phpdbg.exe';
if (PHP_PHPDBG == "yes") {
SAPI('phpdbg', PHPDBG_SOURCES, PHPDBG_EXE);
ADD_FLAG("LIBS_PHPDBG", "ws2_32.lib user32.lib");
DEFINE("CFLAGS", configure_subst.item("CFLAGS") + " /EHa");
SAPI('phpdbg', PHPDBG_SOURCES, PHPDBG_EXE);
ADD_FLAG("LIBS_PHPDBG", "ws2_32.lib user32.lib");
ADD_FLAG("CFLAGS_PHPDBG", "/D YY_NO_UNISTD_H");
}
if (PHP_PHPDBGS == "yes") {
SAPI('phpdbgs', PHPDBG_SOURCES, PHPDBG_DLL, '/D PHP_PHPDBG_EXPORTS /I win32');
ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib");
DEFINE("CFLAGS", configure_subst.item("CFLAGS") + " /EHa");
ADD_FLAG("CFLAGS_PHPDBG", "/D YY_NO_UNISTD_H");
ADD_FLAG("CFLAGS_PHPDBGS", "/D YY_NO_UNISTD_H");
}

2
sapi/phpdbg/phpdbg_watch.c
View file

@ -702,7 +702,7 @@ remove_ht_watch:
}
case WATCH_ON_HASHTABLE:
#ifdef ZEND_DEBUG
#if ZEND_DEBUG
if (watch->addr.ht->inconsistent) {
phpdbg_notice("Watchpoint %s was unset, removing watchpoint", watch->str);
zend_hash_del(&PHPDBG_G(watchpoints), watch->str, watch->str_len);