diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-09-14 09:58:27 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-09-14 09:58:27 +0000 |
| commit | 2604f21fa686661c1c037da11f3a38f0d99c221f (patch) | |
| tree | c488da0b6f873afe11492891083c25458d7c0438 | |
| parent | 3fcfdf573dc7f4b081ec0f47f8d4d024446ab6bb (diff) | |
| download | php-git-2604f21fa686661c1c037da11f3a38f0d99c221f.tar.gz | |
Removed unused macro USE_ZEND_ALLOC
| -rw-r--r-- | Zend/Zend.m4 | 9 | ||||
| -rw-r--r-- | main/streams/php_streams_int.h | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 9069d0d679..fb7b2e06b6 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -168,9 +168,6 @@ AC_ARG_ENABLE(zend-multibyte, 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) @@ -214,12 +211,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 8b83a77763..cee2c01cbe 100644 --- 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))) |