Merge branch 'PHP-7.0' into PHP-7.1

nikic · nikic · commit 33e96c9d632c · 2016-12-14T18:11:43.000+01:00
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2299,7 +2299,7 @@ ZEND_API int is_zend_mm(void)
 #endif
 }
 
-#if !ZEND_DEBUG && (!defined(_WIN32) || defined(__clang__))
+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
 #undef _emalloc
 
 #if ZEND_MM_CUSTOM
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1331,7 +1331,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{
 		 */
 	} else {
 		phpdbg_watch_efree(p);
-		return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		_zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
 } /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -2299,7 +2299,7 @@ ZEND_API int is_zend_mm(void)`
`2299`	`2299`	`#endif`
`2300`	`2300`	`}`
`2301`	`2301`
`2302`		`-#if !ZEND_DEBUG && (!defined(_WIN32) \|\| defined(__clang__))`
	`2302`	`+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)`
`2303`	`2303`	`#undef _emalloc`
`2304`	`2304`
`2305`	`2305`	`#if ZEND_MM_CUSTOM`
Original file line number	Diff line number	Diff line change
`@@ -1331,7 +1331,7 @@ void phpdbg_free_wrapper(void p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) / {{`
`1331`	`1331`	`*/`
`1332`	`1332`	`} else {`
`1333`	`1333`	`phpdbg_watch_efree(p);`
`1334`		`- return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);`
	`1334`	`+ _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);`
`1335`	`1335`	`}`
`1336`	`1336`	`} /* }}} */`
`1337`	`1337`