cvs: php-src(PHP_5_3) /ext/phar phar_internal.h
| From: | Greg Beaver | Date: | Sat, 21 Jun 2008 17:05:33 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar phar_internal.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50519@lists.php.net to get a copy of this message | ||
cellog Sat Jun 21 17:05:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_internal.h
Log:
define ALLOC_PERMANENT_ZVAL for PHP 5.2
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.109.2.17&r2=1.109.2.18&diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.109.2.17 php-src/ext/phar/phar_internal.h:1.109.2.18
--- php-src/ext/phar/phar_internal.h:1.109.2.17 Fri Jun 20 05:42:58 2008
+++ php-src/ext/phar/phar_internal.h Sat Jun 21 17:05:32 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_internal.h,v 1.109.2.17 2008/06/20 05:42:58 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.109.2.18 2008/06/21 17:05:32 cellog Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -72,11 +72,15 @@
#endif
#ifndef E_RECOVERABLE_ERROR
-#define E_RECOVERABLE_ERROR E_ERROR
+# define E_RECOVERABLE_ERROR E_ERROR
#endif
#ifndef pestrndup
-#define pestrndup(s, length, persistent)
((persistent)?zend_strndup((s),(length)):estrndup((s),(length)))
+# define pestrndup(s, length, persistent)
((persistent)?zend_strndup((s),(length)):estrndup((s),(length)))
+#endif
+
+#ifndef ALLOC_PERMANENT_ZVAL
+# define ALLOC_PERMANENT_ZVAL (z) = (zval*)malloc(sizeof(zval));
#endif
/* PHP_ because this is public information via MINFO */