ZTS fix

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 23136aef545a3b0cf4060dfc99c44edcf9cfa241..60bccd96bba90da8bd44df2ce3b313381d1c018b 100644 (file)
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -665,7 +665,7 @@ PHP_FUNCTION(com_create_guid)
        php_com_initialize(TSRMLS_C);
        if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) == S_OK) {
                Z_TYPE_P(return_value) = IS_STRING;
-               Z_STRVAL_P(return_value) = php_com_olestring_to_string(guid_string, &Z_STRLEN_P(return_value), CP_ACP, 0);
+               Z_STRVAL_P(return_value) = php_com_olestring_to_string(guid_string, &Z_STRLEN_P(return_value), CP_ACP TSRMLS_CC);
 
                CoTaskMemFree(guid_string);
        } else {

diff --git a/main/snprintf.c b/main/snprintf.c
index a0167e096d963f3780b6402511de35f135430082..2aba6c1d0a47e58921870677305e7c5f2c8bd916 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -603,8 +603,6 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
        struct lconv *lconv = NULL;
 #endif
 
-       TSRMLS_FETCH();
-
        /*
         * Flag variables
         */
@@ -616,6 +614,8 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
        boolean_e adjust_width;
        bool_int is_negative;
 
+       TSRMLS_FETCH();
+
        sp = odp->nextb;
        bep = odp->buf_end;