Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting

Author: weltling

sapi/phpdbg/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");
 }
+

sapi/phpdbg/phpdbg_watch.c

@@ -702,7 +702,7 @@ static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) {
 				}
 				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);