Fixed Windows build, declarations first ladies and gentlemen

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index d369f68dc27705b483df1c6abad0a4a84c6746fb..ec7a225c7e990add8acc8d62a2c0f3ef43a71178 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -515,10 +515,10 @@ static inline void add_offset_pair(zval *result, zend_uchar utype, char *str, in
        add_next_index_long(match_pair, prev->cp_offset);
        
        if (name) {
-               zval_add_ref(&match_pair);
                UErrorCode status = U_ZERO_ERROR;
                UChar *u = NULL;
                int u_len;
+               zval_add_ref(&match_pair);
                zend_string_to_unicode_ex(UG(utf8_conv), &u, &u_len, name, strlen(name), &status);
                zend_u_hash_update(Z_ARRVAL_P(result), IS_UNICODE, ZSTR(u), u_len+1, &match_pair, sizeof(zval *), NULL);
                efree(u);

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 7345b8de67e9daa95a71b492941293ac588135b8..8dd7c5de23b5eaf49cf91b5aed7952b6c9725657 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1089,6 +1089,9 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
                while (attr) {
                        if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && match_ns(sxe, (xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
                                xmlChar *tmp;
+                               UErrorCode status = U_ZERO_ERROR;
+                               zstr u_name;
+                               int u_name_len;
 
                                MAKE_STD_ZVAL(value);
                                tmp = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1);
@@ -1100,9 +1103,6 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
                                        array_init(zattr);
                                        sxe_properties_add(rv, "@attributes", sizeof("@attributes"), zattr TSRMLS_CC);
                                }
-                               UErrorCode status = U_ZERO_ERROR;
-                               zstr u_name;
-                               int u_name_len;
                                zend_string_to_unicode_ex(UG(utf8_conv), &u_name.u, &u_name_len, (char*)attr->name, namelen, &status);
                                add_u_assoc_zval_ex(zattr, IS_UNICODE, u_name, u_name_len, value);
                                efree(u_name.u);
@@ -2385,6 +2385,8 @@ static int php_sxe_iterator_current_key(zend_object_iterator *iter, zstr *str_ke
        xmlNodePtr curnode = NULL;
        php_sxe_object *intern;
        int namelen;
+       UErrorCode status = U_ZERO_ERROR;
+       int u_len;
 
        php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
        curobj = iterator->sxe->iter.data;
@@ -2397,9 +2399,6 @@ static int php_sxe_iterator_current_key(zend_object_iterator *iter, zstr *str_ke
                return HASH_KEY_NON_EXISTANT;
        }
 
-       UErrorCode status = U_ZERO_ERROR;
-       int u_len;
-
        namelen = xmlStrlen(curnode->name);
        zend_string_to_unicode_ex(UG(utf8_conv), &str_key->u, &u_len, (char*)curnode->name, namelen, &status);
        *str_key_len = u_len + 1;

diff --git a/main/php_variables.c b/main/php_variables.c
index 1c860081b26d13d6b0a8a22a53f841acc09db5e7..48939a49f4ff75d47f5ab58e5f4fe12922dad809 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -531,6 +531,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
        
        while (var) {
                int var_len;
+               UChar *u_var, *u_val;
+               int u_var_len, u_val_len;
+               UErrorCode status = U_ZERO_ERROR;
 
                val = strchr(var, '=');
 
@@ -550,10 +553,6 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
                var_len = strlen(var);
                php_url_decode(var, var_len);
 
-               UChar *u_var, *u_val;
-               int u_var_len, u_val_len;
-               UErrorCode status = U_ZERO_ERROR;
-
                zend_string_to_unicode_ex(input_conv, &u_var, &u_var_len, var, var_len, &status);
                if (U_FAILURE(status)) {
                        /* UTODO set a user-accessible flag to indicate that conversion failed? */