backed out last change after andi decided on a different approach.

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 72f03254f21faf1da785c352b8848eaf95b080bb..82e4a1cd5631256033a91d05e728d203ecdc7c64 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -197,9 +197,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_STRING(n,v)    {                                                                                                                                                               \
                                                                {                                                                                                                                                       \
-                                                                       zval *var;                                                                                                                              \
+                                                                       zval *var = (zval *) emalloc(sizeof(zval));                                                             \
                                                                        char *str=(v); /* prevent 'v' from being evaluated more than once */    \
-                                                                       MAKE_STD_ZVAL(var);                                                                                                     \
                                                                                                                                                                                                                        \
                                                                        var->value.str.val = (str);                                                                                             \
                                                                        var->value.str.len = strlen((str));                                                                             \
@@ -210,8 +209,7 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_STRINGL(n,v,l) {                                                                                                               \
                                                                        {                                                                                                       \
-                                                                               zval *var;                                                                              \
-                                                                               MAKE_STD_ZVAL(var);                                                             \
+                                                                               zval *var = (zval *) emalloc(sizeof(zval));             \
                                                                                                                                                                                \
                                                                                var->value.str.val = (v);                                               \
                                                                                var->value.str.len = (l);                                               \
@@ -222,8 +220,7 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_LONG(n,v)      {                                                                                                                       \
                                                                {                                                                                                               \
-                                                                       zval *var;                                                                                      \
-                                                                       MAKE_STD_ZVAL(var);                                                                     \
+                                                                       zval *var = (zval *) emalloc(sizeof(zval));                     \
                                                                                                                                                                                \
                                                                        var->value.lval = (v);                                                          \
                                                                        var->type = IS_LONG;                                                            \
@@ -233,8 +230,7 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_DOUBLE(n,v)    {                                                                                                                       \
                                                                {                                                                                                               \
-                                                                       zval *var;                                                                                      \
-                                                                       MAKE_STD_ZVAL(var);                                                                     \
+                                                                       zval *var = (zval *) emalloc(sizeof(zval));                     \
                                                                                                                                                                                \
                                                                        var->value.dval = (v);                                                          \
                                                                        var->type = IS_DOUBLE;                                                          \