Merge branch 'PHP-7.0'

nikic · nikic · commit c5212da8b53d · 2016-03-18T19:31:43.000+01:00
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -397,7 +397,7 @@ void shutdown_executor(void) /* {{{ */
 
 	zend_shutdown_fpu();
 
-#ifdef ZEND_DEBUG
+#if ZEND_DEBUG
 	if (EG(ht_iterators_used) && !CG(unclean_shutdown)) {
 		zend_error(E_WARNING, "Leaked %" PRIu32 " hashtable iterators", EG(ht_iterators_used));
 	}

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ void shutdown_executor(void) /* {{{ */`
`397`	`397`
`398`	`398`	`zend_shutdown_fpu();`
`399`	`399`
`400`		`-#ifdef ZEND_DEBUG`
	`400`	`+#if ZEND_DEBUG`
`401`	`401`	`if (EG(ht_iterators_used) && !CG(unclean_shutdown)) {`
`402`	`402`	`zend_error(E_WARNING, "Leaked %" PRIu32 " hashtable iterators", EG(ht_iterators_used));`
`403`	`403`	`}`