pajoye Sun, 06 Sep 2009 15:56:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288110
Log:
- revert last commit, breaks the build and needs test case(s)
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend.h
U php/php-src/branches/PHP_5_3/Zend/zend.h
U php/php-src/trunk/Zend/zend.h
Modified: php/php-src/branches/PHP_5_2/Zend/zend.h
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:43:09 UTC (rev
288109)
+++ php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 15:56:58 UTC (rev
288110)
@@ -200,8 +200,8 @@
# define do_alloca(p) emalloc(p)
# define free_alloca(p) efree(p)
# define ALLOCA_FLAG(name)
-# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1
-# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1
+# define do_alloca_with_limit(p, use_heap) emalloc(p)
+# define free_alloca_with_limit(p, use_heap) efree(p)
#endif
#if ZEND_DEBUG
Modified: php/php-src/branches/PHP_5_3/Zend/zend.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:43:09 UTC (rev
288109)
+++ php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 15:56:58 UTC (rev
288110)
@@ -195,8 +195,8 @@
#else
# define ALLOCA_FLAG(name)
# define SET_ALLOCA_FLAG(name)
-# define do_alloca(p, use_heap) emalloc(p), use_heap = 1
-# define free_alloca(p, use_heap) efree(p), use_heap = 1
+# define do_alloca(p, use_heap) emalloc(p)
+# define free_alloca(p, use_heap) efree(p)
#endif
#if ZEND_DEBUG
Modified: php/php-src/trunk/Zend/zend.h
===================================================================
--- php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109)
+++ php/php-src/trunk/Zend/zend.h 2009-09-06 15:56:58 UTC (rev 288110)
@@ -196,8 +196,8 @@
#else
# define ALLOCA_FLAG(name)
# define SET_ALLOCA_FLAG(name)
-# define do_alloca(p, use_heap) emalloc(p), use_heap = 1
-# define free_alloca(p, use_heap) efree(p), use_heap = 1
+# define do_alloca(p, use_heap) emalloc(p)
+# define free_alloca(p, use_heap) efree(p)
#endif
#if ZEND_DEBUG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
