summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.h
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2004-08-11 06:11:07 +0000
committerDerick Rethans <derick@php.net>2004-08-11 06:11:07 +0000
commit48949785005b2a4d478356b0d859bb5111463842 (patch)
tree79d2d4730afbf91913a77de34e2eb0c8a4ad2cc9 /Zend/zend_alloc.h
parent883e096ce6baeb8e86dd44e4f5452af8bde2fa6c (diff)
downloadphp-git-48949785005b2a4d478356b0d859bb5111463842.tar.gz
- Added missing defines.
#- I did say the patch was for 4.3 ;-)
Diffstat (limited to 'Zend/zend_alloc.h')
-rw-r--r--Zend/zend_alloc.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 187fa530a0..1a85e74dc4 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -156,12 +156,20 @@ ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZE
/* Selective persistent/non persistent allocation macros */
#define pemalloc(size, persistent) malloc(size)
+#define safe_pemalloc(nmemb, size, offset, persistent) malloc((nmemb) * (size) + (offset))
#define pefree(ptr, persistent) free(ptr)
#define pecalloc(nmemb, size, persistent) calloc((nmemb), (size))
#define perealloc(ptr, size, persistent) realloc((ptr), (size))
#define perealloc_recoverable(ptr, size, persistent) realloc((ptr), (size))
#define pestrdup(s, persistent) strdup(s)
+#define pemalloc_rel(size, persistent) malloc(size)
+#define pefree_rel(ptr, persistent) free(ptr)
+#define pecalloc_rel(nmemb, size, persistent) calloc((nmemb), (size))
+#define perealloc_rel(ptr, size, persistent) realloc((ptr), (size))
+#define perealloc_recoverable_rel(ptr, size, persistent) realloc((ptr), (size))
+#define pestrdup_rel(s, persistent) strdup(s)
+
#define safe_estrdup(ptr) ((ptr)?(strdup(ptr)):(empty_string))
#define safe_estrndup(ptr, len) ((ptr)?(strndup((ptr), (len))):(empty_string))