From: Derick Rethans <derick@php.net>
Date: Wed, 11 Aug 2004 06:11:07 +0000 (+0000)
Subject: - Added missing defines.
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48949785005b2a4d478356b0d859bb5111463842;p=php

- Added missing defines.
#- I did say the patch was for 4.3 ;-)
---

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))