diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-12-04 16:08:43 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-12-04 16:08:43 +0000 |
| commit | 0a276c2ff384fa19398c1e8022869ef90b7dd529 (patch) | |
| tree | 66c180c065a9b06fae08d0a13e6f533b253a9c07 | |
| parent | 4c8259b538df157bf2cca3beed87c2da72abbf0f (diff) | |
| download | php-git-0a276c2ff384fa19398c1e8022869ef90b7dd529.tar.gz | |
backed out last change after andi decided on a different approach.
| -rw-r--r-- | Zend/zend_API.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 72f03254f2..82e4a1cd56 100644 --- 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; \ |