cvs: php4 /ext/mbstring mbstring.c
| From: | Marcus B�rger | Date: | Wed, 19 Jun 2002 21:55:46 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12419@lists.php.net to get a copy of this message | ||
helly Wed Jun 19 17:55:46 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
correct handling/generating of php_mbstr_default_identify_list
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.73 php4/ext/mbstring/mbstring.c:1.74
--- php4/ext/mbstring/mbstring.c:1.73 Mon Jun 17 20:56:11 2002
+++ php4/ext/mbstring/mbstring.c Wed Jun 19 17:55:42 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.73 2002/06/18 00:56:11 sniper Exp $ */
+/* $Id: mbstring.c,v 1.74 2002/06/19 21:55:42 helly Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -95,7 +95,7 @@
};
#endif
-#if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -104,7 +104,7 @@
};
#endif
-#if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) &
!defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -113,13 +113,20 @@
};
#endif
-#if defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_JA) & !defined(HAVE_MBSTR_TW) &
!defined(HAVE_MBSTR_KR)
+#if defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) &
!defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
mbfl_no_encoding_koi8r,
mbfl_no_encoding_cp1251,
mbfl_no_encoding_cp866
+};
+#endif
+
+#if !defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) &
!defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
+static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
+ mbfl_no_encoding_ascii,
+ mbfl_no_encoding_utf8
};
#endif