[PHP-CVS] cvs: php4 /ext/wddx wddx.c

[Andrei Zmievski]

andrei          Mon Feb  5 19:57:43 2001 EDT

  Modified files:              
    /php4/ext/wddx      wddx.c 
  Log:
  Don't use Z* macros for non-zvals.
  
  
Index: php4/ext/wddx/wddx.c
diff -u php4/ext/wddx/wddx.c:1.61 php4/ext/wddx/wddx.c:1.62
--- php4/ext/wddx/wddx.c:1.61   Mon Feb  5 19:54:15 2001
+++ php4/ext/wddx/wddx.c        Mon Feb  5 19:57:43 2001
@@ -27,7 +27,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: wddx.c,v 1.61 2001/02/06 03:54:15 andrei Exp $ */
+/* $Id: wddx.c,v 1.62 2001/02/06 03:57:43 andrei Exp $ */
 
 #include "php.h"
 #include "php_wddx.h"
@@ -562,7 +562,7 @@
                        }
                }
        } else if (!strcmp(name, EL_STRING)) {
-               Z_TYPE(ent) = ST_STRING;
+               ent.type = ST_STRING;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -572,7 +572,7 @@
                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);
@@ -592,7 +592,7 @@
                        }
                }
        } else if (!strcmp(name, EL_NUMBER)) {
-               Z_TYPE(ent) = ST_NUMBER;
+               ent.type = ST_NUMBER;
                SET_STACK_VARNAME;
                
                ALLOC_ZVAL(ent.data);
@@ -604,7 +604,7 @@
 
                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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]