summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-05-05 00:50:51 +0200
committerAnatol Belski <ab@php.net>2014-05-05 00:50:51 +0200
commit0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34 (patch)
tree530543bf7327a046f0d79367186e8a70aef2bfe4
parent06ae920165bcedfa2f229ca1da82e51aa1b44e2f (diff)
downloadphp-git-0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34.tar.gz
fixed ZEND_DEBUG usage
-rw-r--r--Zend/zend.c2
-rw-r--r--ext/interbase/php_ibase_includes.h1
-rw-r--r--ext/standard/html.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index ce11631300..34dcc75469 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;