moriyoshi               Sun Aug 24 16:07:14 2003 EDT

  Added files:                 
    /php-src/ext/mbstring/libmbfl       LICENSE Makefile.bcc32 
    /php-src/ext/mbstring/libmbfl/filters       Makefile.bcc32 
    /php-src/ext/mbstring/libmbfl/mbfl  Makefile.bcc32 
    /php-src/ext/mbstring/libmbfl/nls   Makefile.bcc32 

  Removed files:               
    /php-src/ext/mbstring/libmbfl/mbfl  mbfl_compat.h 

  Modified files:              
    /php-src/ext/mbstring/libmbfl       DISCLAIMER README config.h.vc6 
                                        mbfl.def mbfl.rc 
    /php-src/ext/mbstring/libmbfl/mbfl  mbfl_encoding.c mbfl_language.c 
  Log:
  Sync with the original
  
  
Index: php-src/ext/mbstring/libmbfl/DISCLAIMER
diff -u php-src/ext/mbstring/libmbfl/DISCLAIMER:1.1 
php-src/ext/mbstring/libmbfl/DISCLAIMER:1.2
--- php-src/ext/mbstring/libmbfl/DISCLAIMER:1.1 Sat Aug 23 02:18:35 2003
+++ php-src/ext/mbstring/libmbfl/DISCLAIMER     Sun Aug 24 16:07:07 2003
@@ -1,4 +1,5 @@
 # charset=UTF-8
+# vim600: encoding=UTF-8
 
  "streamable kanji code filter and converter"
 
Index: php-src/ext/mbstring/libmbfl/README
diff -u php-src/ext/mbstring/libmbfl/README:1.1 php-src/ext/mbstring/libmbfl/README:1.2
--- php-src/ext/mbstring/libmbfl/README:1.1     Sat Aug 23 02:18:35 2003
+++ php-src/ext/mbstring/libmbfl/README Sun Aug 24 16:07:07 2003
@@ -1,8 +1,8 @@
 This is Libmbfl, a streamable multibyte character code filter and
 converter library.
 
-See DISCLAIMER for licensing information.
+See LICENSE and DISCLAIMER for licensing information.
 
-See the file INSTALL for instructions on how to build and install
-libmbfl.
+See the file INSTALL for building and installation instructions.
 
+# $Id: README,v 1.1.2.2 2003/08/24 18:18:51 moriyoshi Exp
Index: php-src/ext/mbstring/libmbfl/config.h.vc6
diff -u php-src/ext/mbstring/libmbfl/config.h.vc6:1.3 
php-src/ext/mbstring/libmbfl/config.h.vc6:1.4
--- php-src/ext/mbstring/libmbfl/config.h.vc6:1.3       Sat Aug 23 06:04:42 2003
+++ php-src/ext/mbstring/libmbfl/config.h.vc6   Sun Aug 24 16:07:07 2003
@@ -10,5 +10,3 @@
 #define HAVE_WIN32_NATIVE_THREAD 1
 #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.def
diff -u php-src/ext/mbstring/libmbfl/mbfl.def:1.1 
php-src/ext/mbstring/libmbfl/mbfl.def:1.2
--- php-src/ext/mbstring/libmbfl/mbfl.def:1.1   Sat Aug 23 02:18:35 2003
+++ php-src/ext/mbstring/libmbfl/mbfl.def       Sun Aug 24 16:07:07 2003
@@ -3,93 +3,78 @@
 DESCRIPTION "streamable kanji code filter"
 
 EXPORTS
-       _mbfl_encoding_detector_new @1
-       _mbfl_encoding_detector_delete @2
-       _mbfl_encoding_detector_feed @3
-       _mbfl_encoding_detector_judge @4
-       _mbfl_convert_encoding @5
-       _mbfl_identify_encoding @6
-       _mbfl_identify_encoding_name @7
-       _mbfl_identify_encoding_no @8
-       _mbfl_strlen @9
-       _mbfl_strpos @10
-       _mbfl_substr_count @11
-       _mbfl_substr @12
-       _mbfl_strcut @13
-       _mbfl_strwidth @14
-       _mbfl_strimwidth @15
-       _mime_header_encoder_new @16
-       _mime_header_encoder_delete @17
-       _mime_header_encoder_feed @18
-       _mime_header_encoder_result @19
-       _mbfl_mime_header_encode @20
-       _mime_header_decoder_new @21
-       _mime_header_decoder_delete @22
-       _mime_header_decoder_feed @23
-       _mime_header_decoder_result @24
-       _mbfl_mime_header_decode @25
-       _mbfl_html_numeric_entity @26
-       _mbfl_ja_jp_hantozen @27
-       ___mbfl_allocators @28
-       _mbfl_convert_filter_new @29
-       _mbfl_convert_filter_delete @30
-       _mbfl_convert_filter_feed @31
-       _mbfl_convert_filter_flush @32
-       _mbfl_convert_filter_reset @33
-       _mbfl_convert_filter_copy @34
-       _mbfl_filt_conv_illegal_output @35
-       _mbfl_convert_filter_select_vtbl @36
-       _mbfl_convert_filter_get_vtbl @37
-       _mbfl_filt_conv_common_ctor @38
-       _mbfl_filt_conv_common_flush @39
-       _mbfl_filt_conv_common_dtor @40
-       _mbfl_convert_filter_devcat @41
-       _mbfl_convert_filter_strcat @42
-       _mbfl_get_encoding_by_name @43
-       _mbfl_get_encoding_by_id @44
-       _mbfl_encoding_get_id_by_name @45
-       _mbfl_encoding_get_name_by_id @46
-       _mbfl_encoding_get_mime_preferred_name_by_id @47
-       _mbfl_is_supported_encoding @48
-       _mbfl_filter_output_pipe @49
-       _mbfl_filter_output_null @50
-       _mbfl_identify_filter_set_vtbl @51
-       _mbfl_identify_filter_select_vtbl @52
-       _mbfl_identify_filter_new @53
-       _mbfl_identify_filter_delete @54
-       _mbfl_filt_ident_common_ctor @55
-       _mbfl_filt_ident_common_dtor @56
-       _mbfl_filt_ident_false_ctor @57
-       _mbfl_filt_ident_false @58
-       _mbfl_filt_ident_true @59
-       _mbfl_get_language_by_name @60
-       _mbfl_get_language_by_id @61
-       _mbfl_language_get_id_by_name @62
-       _mbfl_language_get_name_by_id @63
-       _mbfl_memory_device_ctor @64
-       _mbfl_memory_device_realloc @65
-       _mbfl_memory_device_dtor @66
-       _mbfl_memory_device_reset @67
-       _mbfl_memory_device_result @68
-       _mbfl_memory_device_unput @69
-       _mbfl_memory_device_output @70
-       _mbfl_memory_device_output2 @71
-       _mbfl_memory_device_output4 @72
-       _mbfl_memory_device_strcat @73
-       _mbfl_memory_device_strncat @74
-       _mbfl_memory_device_devcat @75
-       _mbfl_wchar_device_ctor @76
-       _mbfl_wchar_device_output @77
-       _mbfl_wchar_device_dtor @78
-       _mbfl_string_ctor @79
-       _mbfl_string_ctor2 @80
-       _mbfl_string_dtor @81
-       _mbfl_collection_ctor @82
-       __mbfl_collection_dtor @83
-       _mbfl_list_ctor @84
-       __mbfl_list_dtor @85
-       _mbfl_arraylist_ctor @86
-       __mbfl_arraylist_dtor @87
-       _mbfl_iterator_free @88
-       _mbfl_register_language @89
-       _mbfl_language_id_uni @90
+       _mbfl_buffer_converter_new @1
+       _mbfl_buffer_converter_delete @2
+       _mbfl_buffer_converter_reset @3
+       _mbfl_buffer_converter_illegal_mode @4
+       _mbfl_buffer_converter_illegal_substchar @5
+       _mbfl_buffer_converter_strncat @6
+       _mbfl_buffer_converter_feed @7
+       _mbfl_buffer_converter_flush @8
+       _mbfl_buffer_converter_getbuffer @9
+       _mbfl_buffer_converter_result @10
+       _mbfl_buffer_converter_feed_result @11
+       _mbfl_encoding_detector_new @12
+       _mbfl_encoding_detector_delete @13
+       _mbfl_encoding_detector_feed @14
+       _mbfl_encoding_detector_judge @15
+       _mbfl_convert_encoding @16
+       _mbfl_identify_encoding @17
+       _mbfl_identify_encoding_name @18
+       _mbfl_identify_encoding_no @19
+       _mbfl_strlen @20
+       _mbfl_oddlen @21
+       _mbfl_strpos @22
+       _mbfl_substr_count @23
+       _mbfl_substr @24
+       _mbfl_strcut @25
+       _mbfl_strwidth @26
+       _mbfl_strimwidth @27
+       _mbfl_mime_header_encode @28
+       _mbfl_mime_header_decode @29
+       _mbfl_html_numeric_entity @30
+       _mbfl_ja_jp_hantozen @31
+       ___mbfl_allocators @32
+       _mbfl_convert_filter_list @33
+       _mbfl_convert_filter_new @34
+       _mbfl_convert_filter_delete @35
+       _mbfl_convert_filter_feed @36
+       _mbfl_convert_filter_flush @37
+       _mbfl_convert_filter_reset @38
+       _mbfl_convert_filter_copy @39
+       _mbfl_filt_conv_illegal_output @40
+       _mbfl_convert_filter_select_vtbl @41
+       _mbfl_convert_filter_get_vtbl @42
+       _mbfl_filt_conv_common_ctor @43
+       _mbfl_filt_conv_common_flush @44
+       _mbfl_filt_conv_common_dtor @45
+       _mbfl_encoding_8bit @46
+       _mbfl_encoding_pass @47
+       _mbfl_encoding_wchar @48
+       _mbfl_name2encoding @49
+       _mbfl_no2encoding @50
+       _mbfl_name2no_encoding @51
+       _mbfl_no_encoding2name @52
+       _mbfl_no2preferred_mime_name @53
+       _mbfl_is_support_encoding @54
+       _mbfl_filter_output_pipe @55
+       _mbfl_filter_output_null @56
+       _mbfl_name2language @57
+       _mbfl_no2language @58
+       _mbfl_name2no_language @59
+       _mbfl_no_language2name @60
+       _mbfl_memory_device_init @61
+       _mbfl_memory_device_realloc @62
+       _mbfl_memory_device_clear @63
+       _mbfl_memory_device_reset @64
+       _mbfl_memory_device_result @65
+       _mbfl_memory_device_output @66
+       _mbfl_memory_device_output2 @67
+       _mbfl_memory_device_output4 @68
+       _mbfl_memory_device_strcat @69
+       _mbfl_memory_device_devcat @70
+       _mbfl_wchar_device_init @71
+       _mbfl_wchar_device_output @72
+       _mbfl_string_init @73
+       _mbfl_string_init_set @74
+       _mbfl_string_clear @75
Index: php-src/ext/mbstring/libmbfl/mbfl.rc
diff -u php-src/ext/mbstring/libmbfl/mbfl.rc:1.1 
php-src/ext/mbstring/libmbfl/mbfl.rc:1.2
--- php-src/ext/mbstring/libmbfl/mbfl.rc:1.1    Sat Aug 23 02:18:35 2003
+++ php-src/ext/mbstring/libmbfl/mbfl.rc        Sun Aug 24 16:07:07 2003
@@ -1,4 +1,4 @@
-/* $Id: mbfl.rc,v 1.1 2003/08/23 06:18:35 hirokawa Exp $ */
+/* $Id: mbfl.rc,v 1.2.2.1 2003/08/14 08:22:47 hirokawa Exp */
 1 VERSIONINFO
 FILEVERSION 1,1,0,0 
 PRODUCTVERSION 1,1,0,0 
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.2 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.2       Sat Aug 23 04:26:46 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c   Sun Aug 24 16:07:12 2003
@@ -44,7 +44,6 @@
 #include <strings.h>
 #endif
 
-#include "mbfl_compat.h"
 #include "mbfl_encoding.h"
 #include "mbfilter_pass.h"
 #include "mbfilter_8bit.h"
@@ -95,6 +94,13 @@
 #include "filters/mbfilter_ucs4.h"
 #include "filters/mbfilter_ucs2.h"
 #include "filters/mbfilter_htmlent.h"
+
+#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRICMP
+#define strcasecmp stricmp
+#endif
+#endif 
+
 
 static const char *mbfl_encoding_auto_aliases[] = {"unknown", NULL};
 
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.2 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.2       Sat Aug 23 04:26:46 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c   Sun Aug 24 16:07:12 2003
@@ -50,7 +50,6 @@
 
 #include "mbfl_encoding.h"
 #include "mbfl_language.h"
-#include "mbfl_compat.h"
 
 #include "nls/nls_ja.h"
 #include "nls/nls_kr.h"
@@ -60,6 +59,12 @@
 #include "nls/nls_ru.h"
 #include "nls/nls_en.h"
 #include "nls/nls_neutral.h"
+
+#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRICMP
+#define strcasecmp stricmp
+#endif
+#endif 
 
 static const mbfl_language *mbfl_language_ptr_table[] = {
        &mbfl_language_uni,

Index: php-src/ext/mbstring/libmbfl/Makefile.bcc32
+++ php-src/ext/mbstring/libmbfl/Makefile.bcc32
!include rules.mak.bcc32

SUBDIRS=mbfl nls filters

all: mbfl.dll mbfl.lib

mbfl.lib: mbfl.dll
        implib mbfl.lib mbfl.dll

mbfl.dll: compile mbfl.def mbfl.res
        @if exist linker.rsp del linker.rsp
        @for %i in ($(SUBDIRS)) do @for %j in (%i\*.obj) do @echo %j+ >> linker.rsp
        ilink32 $(LDFLAGS) @linker.rsp,mbfl.dll,,$(LIBS),mbfl.def,mbfl.res
        del linker.rsp

mbfl.res: mbfl.rc
        brcc32 -r mbfl.rc
 
prepare: config.h.bcc32
        @if exist linker.rsp del linker.rsp
        @copy config.h.bcc32 config.h

clean:
        @for %i in ($(SUBDIRS)) do $(COMSPEC) /C mksbcc32.bat $(MAKE) %i clean
        @if exist mbfl.dll del mbfl.dll
        @if exist mbfl.lib del mbfl.lib
        @if exist config.h del config.h

compile: prepare
        @for %i in ($(SUBDIRS)) do $(COMSPEC) /C mksbcc32.bat $(MAKE) %i


Index: php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32
!include ..\rules.mak.bcc32
INCLUDES=$(INCLUDES) -I../mbfl
OBJS=mbfilter_cp936.obj mbfilter_hz.obj mbfilter_euc_tw.obj mbfilter_big5.obj 
mbfilter_euc_jp.obj mbfilter_jis.obj mbfilter_iso8859_1.obj mbfilter_iso8859_2.obj 
mbfilter_cp1252.obj mbfilter_cp1251.obj mbfilter_ascii.obj mbfilter_iso8859_3.obj 
mbfilter_iso8859_4.obj mbfilter_iso8859_5.obj mbfilter_iso8859_6.obj 
mbfilter_iso8859_7.obj mbfilter_iso8859_8.obj mbfilter_iso8859_9.obj 
mbfilter_iso8859_10.obj mbfilter_iso8859_13.obj mbfilter_iso8859_14.obj 
mbfilter_iso8859_15.obj mbfilter_htmlent.obj mbfilter_byte2.obj mbfilter_byte4.obj 
mbfilter_uuencode.obj mbfilter_base64.obj mbfilter_sjis.obj mbfilter_7bit.obj 
mbfilter_qprint.obj mbfilter_ucs4.obj mbfilter_ucs2.obj mbfilter_utf32.obj 
mbfilter_utf16.obj mbfilter_utf8.obj mbfilter_utf7.obj mbfilter_utf7imap.obj 
mbfilter_euc_jp_win.obj mbfilter_cp932.obj mbfilter_euc_cn.obj mbfilter_euc_kr.obj 
mbfilter_uhc.obj mbfilter_iso2022_kr.obj mbfilter_cp866.obj mbfilter_koi8r.obj 
html_entities.obj 

all: $(OBJS)

clean:
        @for %i in ($(OBJS)) do @if exist %i del %i


Index: php-src/ext/mbstring/libmbfl/mbfl/Makefile.bcc32
+++ php-src/ext/mbstring/libmbfl/mbfl/Makefile.bcc32
!include ..\rules.mak.bcc32
OBJS=mbfilter.obj mbfilter_8bit.obj mbfilter_pass.obj mbfilter_wchar.obj 
mbfl_allocators.obj mbfl_convert.obj mbfl_encoding.obj mbfl_filter_output.obj 
mbfl_ident.obj mbfl_language.obj mbfl_memory_device.obj mbfl_string.obj

all: $(OBJS)

clean:
        @for %i in ($(OBJS)) do @if exist %i del %i

Index: php-src/ext/mbstring/libmbfl/nls/Makefile.bcc32
+++ php-src/ext/mbstring/libmbfl/nls/Makefile.bcc32
!include ..\rules.mak.bcc32
INCLUDES=$(INCLUDES) -I..\mbfl
OBJS=nls_ja.obj nls_de.obj nls_en.obj nls_kr.obj nls_ru.obj nls_zh.obj nls_uni.obj 
nls_neutral.obj

all: $(OBJS)

clean:
        @for %i in ($(OBJS)) do @if exist %i del %i

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to