]> granicus.if.org Git - php/commitdiff
fixed ZEND_DEBUG usage
authorAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:50:51 +0000 (00:50 +0200)
committerAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:50:51 +0000 (00:50 +0200)
Zend/zend.c
ext/interbase/php_ibase_includes.h
ext/standard/html.c

index ce116313008524076cb5209d9ea74adafffd4720..34dcc75469596f770a33a2ffd522497698622875 100644 (file)
@@ -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);
        }
index c994a92da50ad812f5a763ebec174b47c39c67e8..6671c9162d0b5aa5a21738b9dd69bf4cc5347198 100644 (file)
@@ -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
index 5bbe39ccbbcee92a7e4fc506406c59d70fa79739..fd210c8086b10fd8b6024ca808a03f096b7828c9 100644 (file)
@@ -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;