Re: [ZEND-ENGINE-CVS] cvs: Zend / zend_alloc.h

On Sun, 28 Apr 2002, Thies C. Arntzen wrote: > On Sun, Apr 28, 2002 at 07:28:21PM +0300, Andi Gutmans wrote: > > Sascha, > > > > Can you merge your change into Engine 2 and the 4_2_0 branch? Having it in > > the 4_2_0 branch means we won't have to bump the API number again for 4.3.x > > ??? > that means we have to bump the API number between 4.2.0 and > 4.2.1. Afaik it should have been bumbed in 4.2.0 already, but somehow Zeev forgot that. Derick > > tc > > > > Andi > > > > At 12:03 27/04/2002 +0000, Sascha Schumann wrote: > > >sas Sat Apr 27 08:03:53 2002 EDT > > > > > > Modified files: > > > /Zend zend_alloc.h > > > Log: > > > Partial backout of last patch. GCC does not seem to optimize > > > across function borders, even if an inlined function is involved. > > > > > > > > >Index: Zend/zend_alloc.h > > >diff -u Zend/zend_alloc.h:1.35 Zend/zend_alloc.h:1.36 > > >--- Zend/zend_alloc.h:1.35 Sat Apr 27 07:49:05 2002 > > >+++ Zend/zend_alloc.h Sat Apr 27 08:03:53 2002 > > >@@ -100,21 +100,10 @@ > > > #define estrndup_rel(s, > > >length) _estrndup((s), (length) > > >ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) > > > #define > > >persist_alloc_rel(p) _persist_alloc((p) > > >ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) > > > > > >-ZEND_API static inline void *zend_fast_calloc(size_t nmemb, size_t size) > > >-{ > > >- void *p; > > >- size_t t = nmemb * size; > > >- > > >- p = malloc(t); > > >- if (p) > > >- memset(p, 0, t); > > >- return p; > > >-} > > >- > > > /* Selective persistent/non persistent allocation macros */ > > > #define pemalloc(size, persistent) > > > ((persistent)?malloc(size):emalloc(size)) > > > #define pefree(ptr, persistent) ((persistent)?free(ptr):efree(ptr)) > > >-#define pecalloc(nmemb, size, persistent) > > >((persistent)?zend_fast_calloc((nmemb), (size)):ecalloc((nmemb), (size))) > > >+#define pecalloc(nmemb, size, persistent) ((persistent)?calloc((nmemb), > > >(size)):ecalloc((nmemb), (size))) > > > #define perealloc(ptr, size, persistent) ((persistent)?realloc((ptr), > > >(size)):erealloc((ptr), (size))) > > > #define perealloc_recoverable(ptr, size, persistent) > > >((persistent)?realloc((ptr), (size)):erealloc_recoverable((ptr), (size))) > > > #define pestrdup(s, persistent) ((persistent)?strdup(s):estrdup(s)) > > > > > > > > > > > >-- > > >Zend Engine CVS Mailing List (http://cvs.php.net/) > > >To unsubscribe, visit: http://www.php.net/unsub.php > > > > > > -- > > Zend Engine CVS Mailing List (http://cvs.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php > > -- > Zend Engine CVS Mailing List (http://cvs.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >