com php-src: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6: config.w32 phpdbg_watch.c
| From: | Bob Weinand | Date: | Fri, 25 Apr 2014 22:15:32 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6: config.w32 phpdbg_watch.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82807@lists.php.net to get a copy of this message | ||
Commit: 9a8123fabbdeea05d9b94638d09efb1440004d50
Author: Anatol Belski <ab@php.net> Sat, 26 Apr 2014 00:15:32 +0200
Parents: 91b599f4a3d525ce75e43a630f150d11bfdde08e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a8123fabbdeea05d9b94638d09efb1440004d50
Log:
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
* phpdbg/master:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
Changed paths:
M config.w32
M phpdbg_watch.c
Diff:
diff --git a/config.w32 b/config.w32
index 33a7b46..17e15b6 100644
--- a/config.w32
+++ b/config.w32
@@ -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");
}
+
diff --git a/phpdbg_watch.c b/phpdbg_watch.c
index 9ee580c..0359b5a 100644
--- a/phpdbg_watch.c
+++ b/phpdbg_watch.c
@@ -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);