com php-src: fixed ZEND_DEBUG usage: Zend/zend.c ex t/interbase/php_ibase_includes.h ext/standard/html.c

Commit: 0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34 Author: Anatol Belski <ab@php.net> Mon, 5 May 2014 00:50:51 +0200 Parents: 06ae920165bcedfa2f229ca1da82e51aa1b44e2f Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34 Log: fixed ZEND_DEBUG usage Changed paths: M Zend/zend.c M ext/interbase/php_ibase_includes.h M ext/standard/html.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index ce11631..34dcc75 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 c994a92..6671c91 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 5bbe39c..fd210c8 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;