*** empty log message ***

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index e697d5b952fe899ccf4e56105c9d2071a6a312df..d6330a689c1c344b0eaa1fd8e9ac706b3c6f9738 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -161,9 +161,6 @@ AC_ARG_ENABLE(memory-limit,
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)
 
-AC_MSG_CHECKING(whether to enable the Zend memory manager)
-AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC)
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
 
@@ -204,12 +201,6 @@ fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
-if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then
-  AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager])
-else
-  AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager])
-fi
-
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"

diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h
index 8b83a77763ec076f760a019eff275ead5d7355bb..cee2c01cbef7e0ebb148fd4deb1ed29501de545a 100644 (file)
--- a/main/streams/php_streams_int.h
+++ b/main/streams/php_streams_int.h
@@ -21,20 +21,15 @@
 
 #if ZEND_DEBUG
 
-#if USE_ZEND_ALLOC
-# define emalloc_rel_orig(size)        \
+#define emalloc_rel_orig(size) \
                ( __php_stream_call_depth == 0 \
                ? _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \
                : _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) )
 
-# define erealloc_rel_orig(ptr, size)  \
+#define erealloc_rel_orig(ptr, size)   \
                ( __php_stream_call_depth == 0 \
                ? _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \
                : _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) )
-#else
-# define emalloc_rel_orig(size)                        emalloc(size)
-# define erealloc_rel_orig(ptr, size)  erealloc(ptr, size)
-#endif
 
 #define pemalloc_rel_orig(size, persistent)    ((persistent) ? malloc((size)) : emalloc_rel_orig((size)))
 #define perealloc_rel_orig(ptr, size, persistent)      ((persistent) ? realloc((ptr), (size)) : erealloc_rel_orig((ptr), (size)))