cvs: ZendEngine2 / zend_alloc.h

derick Wed Aug 11 02:11:07 2004 EDT Modified files: /ZendEngine2 zend_alloc.h Log: - Added missing defines. #- I did say the patch was for 4.3 ;-) http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.h?r1=1.57&r2=1.58&ty=u Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.57 ZendEngine2/zend_alloc.h:1.58 --- ZendEngine2/zend_alloc.h:1.57 Fri Aug 6 20:45:34 2004 +++ ZendEngine2/zend_alloc.h Wed Aug 11 02:11:07 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.h,v 1.57 2004/08/07 00:45:34 andi Exp $ */ +/* $Id: zend_alloc.h,v 1.58 2004/08/11 06:11:07 derick Exp $ */ #ifndef ZEND_ALLOC_H #define ZEND_ALLOC_H @@ -156,11 +156,19 @@ /* 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))