revert previous patch.

diff --git a/ext/mbstring/libmbfl/config.h.vc6 b/ext/mbstring/libmbfl/config.h.vc6
index 9379061dff42a78b0346ba09ee7967aae72979f9..96c97053ed7e23a697023a01e1fa53544577f327 100644 (file)
--- a/ext/mbstring/libmbfl/config.h.vc6
+++ b/ext/mbstring/libmbfl/config.h.vc6
@@ -11,3 +11,4 @@
 #define USE_WIN32_NATIVE_THREAD 1
 #define ENABLE_THREADS 1
 
+#define strcasecmp(s1, s2) stricmp(s1, s2)
\ No newline at end of file

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_compat.h b/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
index 0197e9047d6b406f18cde5a00e2cede74088c4bb..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
@@ -1,3 +1 @@
-#ifndef HAVE_STRCASECMP
-#define strcasecmp(s1, s2) stricmp(s1, s2)
-#endif
+

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index aba18306745fd86ba2d1b77bbfafb6bec37322b5..96a20e7bfff51a21bff11f2e94fe97bb9d3667e7 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3376,7 +3376,7 @@ MBSTRING_API int php_mb_set_zend_encoding(TSRMLS_D)
                entry++;
                n--;
        }
-       zend_multibyte_set_script_encoding(list, (list ? strlen(list) : 0));
+       zend_multibyte_set_script_encoding(list, (list ? strlen(list) : 0) TSRMLS_CC);
        if (list) {
                efree(list);
        }
@@ -3388,10 +3388,10 @@ MBSTRING_API int php_mb_set_zend_encoding(TSRMLS_D)
        if (MBSTRG(encoding_translation)) {
                /* notify internal encoding to Zend Engine */
                name = (char*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding));
-               zend_multibyte_set_internal_encoding(name, strlen(name));
+               zend_multibyte_set_internal_encoding(name, strlen(name) TSRMLS_CC);
        }
 
-       zend_multibyte_set_functions(encoding_detector, encoding_converter, encoding_oddlen);
+       zend_multibyte_set_functions(encoding_detector, encoding_converter, encoding_oddlen TSRMLS_CC);
 
        return 0;
 }