cvs: php4 /ext/mbstring mbstring.c
| From: | Marcus B�rger | Date: | Tue, 27 Aug 2002 14:57:10 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13705@lists.php.net to get a copy of this message | ||
helly Tue Aug 27 10:57:10 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Remove this nonsense - this makes the module unpredicable since we do
not have default values in ini and more encodings will follow.
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.92 php4/ext/mbstring/mbstring.c:1.93
--- php4/ext/mbstring/mbstring.c:1.92 Wed Aug 14 02:38:07 2002
+++ php4/ext/mbstring/mbstring.c Tue Aug 27 10:57:09 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.92 2002/08/14 06:38:07 dets Exp $ */
+/* $Id: mbstring.c,v 1.93 2002/08/27 14:57:09 helly Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -662,31 +662,6 @@
MBSTRG(current_language) = mbfl_no_language_english;
MBSTRG(internal_encoding) = mbfl_no_encoding_8859_1;
MBSTRG(current_internal_encoding) = mbfl_no_encoding_8859_1;
-
-#if defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
- MBSTRG(language) = mbfl_no_language_simplified_chinese;
- MBSTRG(current_language) = mbfl_no_language_simplified_chinese;
- MBSTRG(internal_encoding) = mbfl_no_encoding_euc_cn;
- MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_cn;
-#endif
-#if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_JA)
- MBSTRG(language) = mbfl_no_language_traditional_chinese;
- MBSTRG(current_language) = mbfl_no_language_traditional_chinese;
- MBSTRG(internal_encoding) = mbfl_no_encoding_euc_tw;
- MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_tw;
-#endif
-#if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_JA)
- MBSTRG(language) = mbfl_no_language_korean;
- MBSTRG(current_language) = mbfl_no_language_korean;
- MBSTRG(internal_encoding) = mbfl_no_encoding_euc_kr;
- MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_kr;
-#endif
-#if defined(HAVE_MBSTR_JA)
- MBSTRG(language) = mbfl_no_language_japanese;
- MBSTRG(current_language) = mbfl_no_language_japanese;
- MBSTRG(internal_encoding) = mbfl_no_encoding_euc_jp;
- MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_jp;
-#endif
#ifdef ZEND_MULTIBYTE
MBSTRG(script_encoding_list) = NULL;
MBSTRG(script_encoding_list_size) = 0;