hirokawa Sat Aug 23 06:04:44 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/libmbfl config.h.vc6
/php-src/ext/mbstring/libmbfl/mbfl mbfl_compat.h
Log:
revert previous patch.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.191 php-src/ext/mbstring/mbstring.c:1.192
--- php-src/ext/mbstring/mbstring.c:1.191 Sat Aug 23 04:59:47 2003
+++ php-src/ext/mbstring/mbstring.c Sat Aug 23 06:04:42 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.191 2003/08/23 08:59:47 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.192 2003/08/23 10:04:42 hirokawa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -3376,7 +3376,7 @@
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 @@
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;
}
Index: php-src/ext/mbstring/libmbfl/config.h.vc6
diff -u php-src/ext/mbstring/libmbfl/config.h.vc6:1.2
php-src/ext/mbstring/libmbfl/config.h.vc6:1.3
--- php-src/ext/mbstring/libmbfl/config.h.vc6:1.2 Sat Aug 23 04:26:45 2003
+++ php-src/ext/mbstring/libmbfl/config.h.vc6 Sat Aug 23 06:04:42 2003
@@ -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
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_compat.h:1.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_compat.h:1.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_compat.h:1.1 Sat Aug 23 04:26:46 2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_compat.h Sat Aug 23 06:04:43 2003
@@ -1,3 +1 @@
-#ifndef HAVE_STRCASECMP
-#define strcasecmp(s1, s2) stricmp(s1, s2)
-#endif
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
