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 /main/streams/php_streams_int.h | |
| parent | 3fcfdf573dc7f4b081ec0f47f8d4d024446ab6bb (diff) | |
| download | php-git-2604f21fa686661c1c037da11f3a38f0d99c221f.tar.gz | |
Removed unused macro USE_ZEND_ALLOC
Diffstat (limited to 'main/streams/php_streams_int.h')
| -rw-r--r-- | main/streams/php_streams_int.h | 9 |
1 files changed, 2 insertions, 7 deletions
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))) |