diff options
| author | Anatol Belski <ab@php.net> | 2014-04-26 00:15:32 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-26 00:15:32 +0200 |
| commit | a10dc3aa4f1571bde0db7edf8a6e4780026ea63a (patch) | |
| tree | ddcba23546bb5cea8926d5c57599dbbb5e3b2ee3 /sapi/phpdbg/phpdbg_watch.c | |
| parent | 70fdb21d9354f34050c30842a313eddae766a580 (diff) | |
| parent | c8617d82cc9333e87e264a77bcaa53f9754a034e (diff) | |
| download | php-git-a10dc3aa4f1571bde0db7edf8a6e4780026ea63a.tar.gz | |
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
Diffstat (limited to 'sapi/phpdbg/phpdbg_watch.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |