Fix IS_UNSET -> IS_NULL rename.

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 916e7898f2ad21963e9907a1e90ecae28271081b..c15f0f392ad7bc0a03a969f075d8fd615fb5db38 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1257,7 +1257,7 @@ PHP_FUNCTION(mysql_result)
                        return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
                }
        } else {
-               return_value->type = IS_UNSET;
+               return_value->type = IS_NULL;
        }
 }
 /* }}} */

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index c255b8a6d52f9e0505512c548e68dbada0078972..0b500c6bb453bb9f8fe8969057ec1d909b4b5706 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -442,7 +442,7 @@ void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name)
                        php_wddx_serialize_boolean(packet, var);
                        break;
 
-               case IS_UNSET:
+               case IS_NULL:
                        php_wddx_serialize_unset(packet);
                        break;
                
@@ -548,7 +548,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char
 
                ALLOC_ZVAL(ent.data);
                INIT_PZVAL(ent.data);
-               ent.data->type = IS_UNSET;
+               ZVAL_NULL(ent.data);
                
                wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
        } else if (!strcmp(name, EL_ARRAY)) {