diff options
| author | Anatol Belski <ab@php.net> | 2014-04-26 00:17:09 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-26 00:17:09 +0200 |
| commit | 5dbe7c98e43f9347fd970e9258af41492a0f96dc (patch) | |
| tree | 1c4fe0e27a77368164f4f3c7e1ac0422f0241679 | |
| parent | e5b8fd2cc73b9e2c2f6f99f72bc225564b15b935 (diff) | |
| parent | a10dc3aa4f1571bde0db7edf8a6e4780026ea63a (diff) | |
| download | php-git-5dbe7c98e43f9347fd970e9258af41492a0f96dc.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
| -rw-r--r-- | sapi/phpdbg/config.w32 | 9 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_watch.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32 index 33a7b46d4f..17e15b6ced 100644 --- a/sapi/phpdbg/config.w32 +++ b/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"); } + diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 9ee580ca0b..0359b5a7de 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/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); |