diff options
| author | Anatol Belski <ab@php.net> | 2014-05-05 00:51:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-05 00:51:40 +0200 |
| commit | 149568f4da75a148d6ca71073b353f0d5f8f477a (patch) | |
| tree | c851c97088e0573142cd0de3e054bf8ef6ba3fdd | |
| parent | 53b4d2feea960afadd17e661df7d712b51017798 (diff) | |
| parent | 0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34 (diff) | |
| download | php-git-149568f4da75a148d6ca71073b353f0d5f8f477a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed ZEND_DEBUG usage
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | ext/interbase/php_ibase_includes.h | 1 | ||||
| -rw-r--r-- | ext/standard/html.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index acbbcbebc7..d735e4a9e7 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -954,7 +954,7 @@ ZEND_API void zend_deactivate(TSRMLS_D) /* {{{ */ zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); -#ifdef ZEND_DEBUG +#if ZEND_DEBUG if (GC_G(gc_enabled) && !CG(unclean_shutdown)) { gc_collect_cycles(TSRMLS_C); } diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index c994a92da5..6671c9162d 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -35,6 +35,7 @@ #define IB_STATUS (IBG(status)) +/* XXX ZEND_DEBUG_ is misleading, it should be something like IBASE_DEBUG. */ #ifdef ZEND_DEBUG_ #define IBDEBUG(a) php_printf("::: %s (%d)\n", a, __LINE__); #endif diff --git a/ext/standard/html.c b/ext/standard/html.c index 5bbe39ccbb..fd210c8086 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -901,7 +901,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse #if 0 return php_mb2_int_to_char(buf, code); #else -#ifdef ZEND_DEBUG +#if ZEND_DEBUG assert(code <= 0xFFU); #endif *buf = code; @@ -912,7 +912,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse #if 0 /* idem */ return php_mb2_int_to_char(buf, code); #else -#ifdef ZEND_DEBUG +#if ZEND_DEBUG assert(code <= 0xFFU); #endif *buf = code; |