Undo Z_ subst

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 80242507f95a05de18492cf1281d2597d62956b6..290673e4cc2d3f5adc1524c153e2c4c0100c071d 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -681,7 +681,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                        }
                }
        } else if (!strcmp(name, EL_STRING)) {
-               Z_TYPE(ent) = ST_STRING;
+               ent.type = ST_STRING;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -691,7 +691,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                Z_STRLEN_P(ent.data) = 0;
                wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
        } else if (!strcmp(name, EL_BINARY)) {
-               Z_TYPE(ent) = ST_BINARY;
+               ent.type = ST_BINARY;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -711,7 +711,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                        }
                }
        } else if (!strcmp(name, EL_NUMBER)) {
-               Z_TYPE(ent) = ST_NUMBER;
+               ent.type = ST_NUMBER;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -723,7 +723,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
 
                for (i=0; atts[i]; i++) {
                        if (!strcmp(atts[i], EL_VALUE) && atts[i+1]) {
-                               Z_TYPE(ent) = ST_BOOLEAN;
+                               ent.type = ST_BOOLEAN;
                                SET_STACK_VARNAME;
 
                                ALLOC_ZVAL(ent.data);
@@ -734,7 +734,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                        }
                }
        } else if (!strcmp(name, EL_NULL)) {
-               Z_TYPE(ent) = ST_NULL;
+               ent.type = ST_NULL;
                SET_STACK_VARNAME;
 
                ALLOC_ZVAL(ent.data);
@@ -743,7 +743,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                
                wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
        } else if (!strcmp(name, EL_ARRAY)) {
-               Z_TYPE(ent) = ST_ARRAY;
+               ent.type = ST_ARRAY;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -751,7 +751,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
                INIT_PZVAL(ent.data);
                wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
        } else if (!strcmp(name, EL_STRUCT)) {
-               Z_TYPE(ent) = ST_STRUCT;
+               ent.type = ST_STRUCT;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);