cvs: ZendEngine2(PHP_5_3) / zend_alloc.h
[email protected] ("David Soria Parra") Sun, 25 Jan 2009 13:41:51 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsdsp1232890911@cvsserver> |
dsp Sun Jan 25 13:41:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_alloc.h
Log:
Fix WS
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.h?r1=1.63.2.2.2.12.2.8&r2=1.63.2.2.2.12.2.9&diff_format=u
Index: ZendEngine2/zend_alloc.h
diff -u ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.8 ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.9
--- ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.8 Wed Dec 31 11:15:31 2008
+++ ZendEngine2/zend_alloc.h Sun Jan 25 13:41:50 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.8 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.9 2009/01/25 13:41:50 dsp Exp $ */
#ifndef ZEND_ALLOC_H
#define ZEND_ALLOC_H
@@ -78,29 +78,29 @@
inline static void * __zend_malloc(size_t len)
{
- void *tmp = malloc(len);
- if (tmp) {
- return tmp;
- }
- fprintf(stderr, "Out of memory\n");
- exit(1);
+ void *tmp = malloc(len);
+ if (tmp) {
+ return tmp;
+ }
+ fprintf(stderr, "Out of memory\n");
+ exit(1);
}
inline static void * __zend_calloc(size_t nmemb, size_t len)
{
- void *tmp = _safe_malloc(nmemb, len, 0);
- memset(tmp, 0, len);
- return tmp;
+ void *tmp = _safe_malloc(nmemb, len, 0);
+ memset(tmp, 0, len);
+ return tmp;
}
inline static void * __zend_realloc(void *p, size_t len)
{
- p = realloc(p, len);
- if (p) {
- return p;
- }
- fprintf(stderr, "Out of memory\n");
- exit(1);
+ p = realloc(p, len);
+ if (p) {
+ return p;
+ }
+ fprintf(stderr, "Out of memory\n");
+ exit(1);
}