Patch php700rc2-solaris10studio121.patch for Compile Failure Bug #70492

Patch version 2015-09-14 14:25 UTC

• 2015-09-14 14:25 UTC [diff to current]

Developer: hsk@imb-jena.de

--- ext/fileinfo/libmagic/apprentice.c__dist	Thu Sep  3 23:32:51 2015
+++ ext/fileinfo/libmagic/apprentice.c	Fri Sep 11 12:12:53 2015
@@ -40,6 +40,7 @@
 #include "magic.h"
 #include "patchlevel.h"
 #include <stdlib.h>
+#include <stddef.h>
 
 #if defined(__hpux) && !defined(HAVE_STRTOULL)
 #if SIZEOF_LONG == 8
--- Zend/zend_alloc.c__dist	Thu Sep  3 23:32:51 2015
+++ Zend/zend_alloc.c	Mon Sep 14 16:07:27 2015
@@ -2274,7 +2274,7 @@
 #endif
 }
 
-#if !ZEND_DEBUG && !defined(_WIN32)
+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P) && !defined(_WIN32)
 #undef _emalloc
 
 #if ZEND_MM_CUSTOM
--- Zend/zend_alloc.h__dist	Thu Sep  3 23:32:51 2015
+++ Zend/zend_alloc.h	Mon Sep 14 16:02:24 2015
@@ -88,7 +88,7 @@
 #include "zend_alloc_sizes.h"
 
 /* _emalloc() & _efree() specialization */
-#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P) && !defined(_WIN32)
 
 # define _ZEND_BIN_ALLOCATOR_DEF(_num, _size, _elements, _pages, x, y) \
 	ZEND_API void* ZEND_FASTCALL _emalloc_  ## _size(void) ZEND_ATTRIBUTE_MALLOC;
--- sapi/phpdbg/phpdbg.c__dist	Thu Sep  3 23:32:51 2015
+++ sapi/phpdbg/phpdbg.c	Fri Sep 11 15:40:13 2015
@@ -1258,5 +1258,5 @@
 		 */
 	} else {
 		phpdbg_watch_efree(p);
-		return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		/*return*/ _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
 } /* }}} */