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

diff --git a/config.w32 b/config.w32
index 33a7b46d4f68e3bb89ed760e67aea2670621877c..17e15b6ced08fb6961a5d6b17d28f00cf71f3def 100644 (file)
--- 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 9ee580ca0bdf308bf0fd7454b8dd8c5f2098c100..0359b5a7deb5f6c17e3e9147019a83f371a45206 100644 (file)
--- 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);