Fix conditional compilation

weltling · weltling · commit 08a0030b33a4 · 2019-05-29T02:40:09.000+02:00
The new symbols are shared and don't need to depend on the availability
of __builtin_constant_p.
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2373,9 +2373,6 @@ ZEND_API int is_zend_ptr(const void *ptr)
 	return 0;
 }
 
-#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
-#undef _emalloc
-
 #if ZEND_MM_CUSTOM
 
 static ZEND_COLD void* ZEND_FASTCALL _malloc_custom(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
@@ -2404,7 +2401,12 @@ static ZEND_COLD void* ZEND_FASTCALL _realloc_custom(void *ptr, size_t size ZEND
 		return AG(mm_heap)->custom_heap.std._realloc(ptr, size);
 	}
 }
+#endif
 
+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
+#undef _emalloc
+
+#if ZEND_MM_CUSTOM
 # define ZEND_MM_CUSTOM_ALLOCATOR(size) do { \
 		if (UNEXPECTED(AG(mm_heap)->use_custom_heap)) { \
 			return _malloc_custom(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \

Original file line number	Diff line number	Diff line change
`@@ -2373,9 +2373,6 @@ ZEND_API int is_zend_ptr(const void *ptr)`
`2373`	`2373`	`return 0;`
`2374`	`2374`	`}`
`2375`	`2375`
`2376`		`-#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)`
`2377`		`-#undef _emalloc`
`2378`		`-`
`2379`	`2376`	`#if ZEND_MM_CUSTOM`
`2380`	`2377`
`2381`	`2378`	`static ZEND_COLD void* ZEND_FASTCALL _malloc_custom(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)`
`@@ -2404,7 +2401,12 @@ static ZEND_COLD void* ZEND_FASTCALL _realloc_custom(void *ptr, size_t size ZEND`
`2404`	`2401`	`return AG(mm_heap)->custom_heap.std._realloc(ptr, size);`
`2405`	`2402`	`}`
`2406`	`2403`	`}`
	`2404`	`+#endif`
`2407`	`2405`
	`2406`	`+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)`
	`2407`	`+#undef _emalloc`
	`2408`	`+`
	`2409`	`+#if ZEND_MM_CUSTOM`
`2408`	`2410`	`# define ZEND_MM_CUSTOM_ALLOCATOR(size) do { \`
`2409`	`2411`	`if (UNEXPECTED(AG(mm_heap)->use_custom_heap)) { \`
`2410`	`2412`	`return _malloc_custom(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \`