cvs: ZendEngine2 / zend_alloc.h
| From: | Jani Taskinen | Date: | Thu, 07 Apr 2005 16:22:15 +0000 |
| Subject: | cvs: ZendEngine2 / zend_alloc.h | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3541@lists.php.net to get a copy of this message | ||
sniper Thu Apr 7 12:22:15 2005 EDT
Modified files:
/ZendEngine2 zend_alloc.h
Log:
Fix build when USE_ZEND_ALLOC is 0
http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.h?r1=1.59&r2=1.60&ty=u
Index: ZendEngine2/zend_alloc.h
diff -u ZendEngine2/zend_alloc.h:1.59 ZendEngine2/zend_alloc.h:1.60
--- ZendEngine2/zend_alloc.h:1.59 Thu Apr 7 09:59:45 2005
+++ ZendEngine2/zend_alloc.h Thu Apr 7 12:22:15 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.h,v 1.59 2005/04/07 13:59:45 zeev Exp $ */
+/* $Id: zend_alloc.h,v 1.60 2005/04/07 16:22:15 sniper Exp $ */
#ifndef ZEND_ALLOC_H
#define ZEND_ALLOC_H
@@ -172,8 +172,8 @@
#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))
+#define safe_estrdup(ptr) ((ptr)?(strdup(ptr)):(STR_EMPTY_ALLOC()))
+#define safe_estrndup(ptr, len) ((ptr)?(_strndup((ptr), (len))):(STR_EMPTY_ALLOC()))
#endif