diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2002-04-28 06:24:15 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2002-04-28 06:24:15 +0000 |
| commit | 8463225b494ebf0d82cdfea69df386699bbdd2df (patch) | |
| tree | e402da97aaee6851ad738514bffd5f7a9b5465f5 /Zend/zend_alloc.h | |
| parent | 305260ce4a2c03dc0a0c58f56f2bd1d0a5809cca (diff) | |
| download | php-git-8463225b494ebf0d82cdfea69df386699bbdd2df.tar.gz | |
Revert.
Diffstat (limited to 'Zend/zend_alloc.h')
| -rw-r--r-- | Zend/zend_alloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 76a5bf2e39..c89fbfd04a 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -75,6 +75,7 @@ ZEND_API char *zend_strndup(const char *s, unsigned int length); ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); @@ -93,7 +94,7 @@ ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); /* Relay wrapper macros */ #define emalloc_rel(size) _emalloc((size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define efree_rel(ptr) _efree((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) -#define ecalloc_rel(nmemb, size) memset(_emalloc((nmemb)*(size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC), 0, (nmemb)*(size)) +#define ecalloc_rel(nmemb, size) _ecalloc((nmemb), (size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define erealloc_rel(ptr, size) _erealloc((ptr), (size), 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define erealloc_recoverable_rel(ptr, size) _erealloc((ptr), (size), 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define estrdup_rel(s) _estrdup((s) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) |