cvs: php-src /ext/mbstring/libmbfl .cvsignore mbfl.rc missing rules.mak.bcc32 /ext/mbstring/libmbfl/filters .cvsignore /ext/mbstring/libmbfl/mbfl
.cvsignore Makefile.am mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_allocators.h mbfl_convert.h mbfl_defs.h mbfl_encoding.h
mbfl_filter_output.h mbfl_ident.h mbfl_language.h mbfl_memory_device.h mbfl_string.h /ext/mbstring/libmbfl/nls .cvsignore

moriyoshi Sun Aug 24 21:44:19 2003 EDT Added files: /php-src/ext/mbstring/libmbfl/mbfl mbfl_defs.h Removed files: /php-src/ext/mbstring/libmbfl missing Modified files: /php-src/ext/mbstring/libmbfl .cvsignore mbfl.rc rules.mak.bcc32 /php-src/ext/mbstring/libmbfl/filters .cvsignore /php-src/ext/mbstring/libmbfl/mbfl .cvsignore Makefile.am mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_allocators.h mbfl_convert.h mbfl_encoding.h mbfl_filter_output.h mbfl_ident.h mbfl_language.h mbfl_memory_device.h mbfl_string.h /php-src/ext/mbstring/libmbfl/nls .cvsignore Log: Sync with original

Index: php-src/ext/mbstring/libmbfl/.cvsignore diff -u php-src/ext/mbstring/libmbfl/.cvsignore:1.1 php-src/ext/mbstring/libmbfl/.cvsignore:1.2 --- php-src/ext/mbstring/libmbfl/.cvsignore:1.1 Sat Aug 23 02:20:56 2003 +++ php-src/ext/mbstring/libmbfl/.cvsignore Sun Aug 24 21:44:14 2003 @@ -1,13 +1,37 @@ +autom4te.cache +aclocal.m4 +Makefile +Makefile.in +autoscan.log +configure +config.h.in +config.sub +config.log +config.guess +config.status +config.h +libtool +depcomp +ltmain.sh +install-sh +stamp-h1 +mkinstalldirs +missing +.deps +.libs +*.dll +*.lib *.lo +*.tar +*.tar.gz +*.tar.bz2 +*.o *.la -.deps -*.plg -*.opt +*.a +*.RES +*.res +*.obj +*.tds +*~ +*.suo *.ncb -Release -Release_inline -Debug -Release_TS -Release_TSDbg -Release_TS_inline -Debug_TS Index: php-src/ext/mbstring/libmbfl/mbfl.rc diff -u php-src/ext/mbstring/libmbfl/mbfl.rc:1.2 php-src/ext/mbstring/libmbfl/mbfl.rc:1.3 --- php-src/ext/mbstring/libmbfl/mbfl.rc:1.2 Sun Aug 24 16:07:07 2003 +++ php-src/ext/mbstring/libmbfl/mbfl.rc Sun Aug 24 21:44:14 2003 @@ -1,4 +1,4 @@ -/* $Id: mbfl.rc,v 1.2.2.1 2003/08/14 08:22:47 hirokawa Exp */ +/* $Id: mbfl.rc,v 1.3 2003/08/25 01:44:14 moriyoshi Exp $ */ 1 VERSIONINFO FILEVERSION 1,1,0,0 PRODUCTVERSION 1,1,0,0 Index: php-src/ext/mbstring/libmbfl/rules.mak.bcc32 diff -u php-src/ext/mbstring/libmbfl/rules.mak.bcc32:1.1 php-src/ext/mbstring/libmbfl/rules.mak.bcc32:1.2 --- php-src/ext/mbstring/libmbfl/rules.mak.bcc32:1.1 Sat Aug 23 02:18:35 2003 +++ php-src/ext/mbstring/libmbfl/rules.mak.bcc32 Sun Aug 24 21:44:14 2003 @@ -1,5 +1,5 @@ .suffixes .c -CFLAGS=-DHAVE_CONFIG_H -DMBFL_DLL_EXPORT -u +CFLAGS=-DHAVE_CONFIG_H -DMBFL_DLL_EXPORT -DWIN32 INCLUDES=-I. -I.. LIBS=import32.lib cw32mt.lib c0d32.obj LDFLAGS=-c -Tpd -Gn Index: php-src/ext/mbstring/libmbfl/filters/.cvsignore diff -u php-src/ext/mbstring/libmbfl/filters/.cvsignore:1.1 php-src/ext/mbstring/libmbfl/filters/.cvsignore:1.2 --- php-src/ext/mbstring/libmbfl/filters/.cvsignore:1.1 Sat Aug 23 02:20:56 2003 +++ php-src/ext/mbstring/libmbfl/filters/.cvsignore Sun Aug 24 21:44:15 2003 @@ -1,13 +1,8 @@ -*.lo -*.la +Makefile +Makefile.in .deps -*.plg -*.opt -*.ncb -Release -Release_inline -Debug -Release_TS -Release_TSDbg -Release_TS_inline -Debug_TS +.libs +*.la +*.a +*.o +*.lo Index: php-src/ext/mbstring/libmbfl/mbfl/.cvsignore diff -u php-src/ext/mbstring/libmbfl/mbfl/.cvsignore:1.1 php-src/ext/mbstring/libmbfl/mbfl/.cvsignore:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/.cvsignore:1.1 Sat Aug 23 02:20:57 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/.cvsignore Sun Aug 24 21:44:16 2003 @@ -1,13 +1,8 @@ -*.lo -*.la +Makefile +Makefile.in .deps -*.plg -*.opt -*.ncb -Release -Release_inline -Debug -Release_TS -Release_TSDbg -Release_TS_inline -Debug_TS +.libs +*.la +*.a +*.o +*.lo Index: php-src/ext/mbstring/libmbfl/mbfl/Makefile.am diff -u php-src/ext/mbstring/libmbfl/mbfl/Makefile.am:1.1 php-src/ext/mbstring/libmbfl/mbfl/Makefile.am:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/Makefile.am:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/Makefile.am Sun Aug 24 21:44:16 2003 @@ -4,7 +4,7 @@ libmbfl_nls_la=../nls/libmbfl_nls.la libmbfl_la_LIBADD=$(libmbfl_filters_la) $(libmbfl_nls_la) libmbfl_includedir=$(includedir)/mbfl -libmbfl_include_HEADERS=mbfilter.h mbfl_consts.h mbfl_encoding.h mbfl_language.h mbfl_string.h mbfl_convert.h mbfl_ident.h mbfl_memory_device.h mbfl_allocators.h +libmbfl_include_HEADERS=mbfilter.h mbfl_consts.h mbfl_encoding.h mbfl_language.h mbfl_string.h mbfl_convert.h mbfl_ident.h mbfl_memory_device.h mbfl_allocators.h mbfl_defs.h $(libmbfl_filters_la): $(MAKE) -C `dirname $(libmbfl_filters_la)` Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h Sun Aug 24 21:44:16 2003 @@ -89,6 +89,7 @@ #ifndef MBFL_MBFILTER_H #define MBFL_MBFILTER_H +#include "mbfl_defs.h" #include "mbfl_consts.h" #include "mbfl_allocators.h" #include "mbfl_encoding.h" @@ -97,14 +98,6 @@ #include "mbfl_convert.h" #include "mbfl_ident.h" -#ifndef NULL -#ifdef __cplusplus -#define NULL (0L) -#else -#define NULL (void *)(0L) -#endif -#endif - /* * convert filter */ @@ -125,17 +118,17 @@ const mbfl_encoding *to; }; -mbfl_buffer_converter * mbfl_buffer_converter_new(enum mbfl_no_encoding from, enum mbfl_no_encoding to, int buf_initsz); -void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd); -void mbfl_buffer_converter_reset(mbfl_buffer_converter *convd); -int mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode); -int mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substchar); -int mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, int n); -int mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string); -int mbfl_buffer_converter_flush(mbfl_buffer_converter *convd); -mbfl_string * mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result); -mbfl_string * mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result); -mbfl_string * mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string, mbfl_string *result); +MBFLAPI extern mbfl_buffer_converter * mbfl_buffer_converter_new(enum mbfl_no_encoding from, enum mbfl_no_encoding to, int buf_initsz); +MBFLAPI extern void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd); +MBFLAPI extern void mbfl_buffer_converter_reset(mbfl_buffer_converter *convd); +MBFLAPI extern int mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode); +MBFLAPI extern int mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substchar); +MBFLAPI extern int mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, int n); +MBFLAPI extern int mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string); +MBFLAPI extern int mbfl_buffer_converter_flush(mbfl_buffer_converter *convd); +MBFLAPI extern mbfl_string * mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result); +MBFLAPI extern mbfl_string * mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result); +MBFLAPI extern mbfl_string * mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string, mbfl_string *result); /* * encoding detector @@ -147,78 +140,78 @@ int filter_list_size; }; -mbfl_encoding_detector * mbfl_encoding_detector_new(enum mbfl_no_encoding *elist, int eliztsz); -void mbfl_encoding_detector_delete(mbfl_encoding_detector *identd); -int mbfl_encoding_detector_feed(mbfl_encoding_detector *identd, mbfl_string *string); -enum mbfl_no_encoding mbfl_encoding_detector_judge(mbfl_encoding_detector *identd); +MBFLAPI extern mbfl_encoding_detector * mbfl_encoding_detector_new(enum mbfl_no_encoding *elist, int eliztsz); +MBFLAPI extern void mbfl_encoding_detector_delete(mbfl_encoding_detector *identd); +MBFLAPI extern int mbfl_encoding_detector_feed(mbfl_encoding_detector *identd, mbfl_string *string); +MBFLAPI extern enum mbfl_no_encoding mbfl_encoding_detector_judge(mbfl_encoding_detector *identd); /* * encoding converter */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_convert_encoding(mbfl_string *string, mbfl_string *result, enum mbfl_no_encoding toenc); /* * identify encoding */ -const mbfl_encoding * +MBFLAPI extern const mbfl_encoding * mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz, int strict); -const char * +MBFLAPI extern const char * mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz, int strict); -const enum mbfl_no_encoding +MBFLAPI extern const enum mbfl_no_encoding mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz); /* * strlen */ -int +MBFLAPI extern int mbfl_strlen(mbfl_string *string); /* * oddlen */ -int +MBFLAPI extern int mbfl_oddlen(mbfl_string *string); /* * strpos */ -int +MBFLAPI extern int mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, int offset, int reverse); /* * substr_count */ -int +MBFLAPI extern int mbfl_substr_count(mbfl_string *haystack, mbfl_string *needle); /* * substr */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_substr(mbfl_string *string, mbfl_string *result, int from, int length); /* * strcut */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_strcut(mbfl_string *string, mbfl_string *result, int from, int length); /* * strwidth */ -int +MBFLAPI extern int mbfl_strwidth(mbfl_string *string); /* * strimwidth */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_strimwidth(mbfl_string *string, mbfl_string *marker, mbfl_string *result, int from, int width); /* @@ -226,22 +219,22 @@ */ struct mime_header_encoder_data; /* forward declaration */ -struct mime_header_encoder_data * +MBFLAPI extern struct mime_header_encoder_data * mime_header_encoder_new( enum mbfl_no_encoding incode, enum mbfl_no_encoding outcode, enum mbfl_no_encoding encoding); -void +MBFLAPI extern void mime_header_encoder_delete(struct mime_header_encoder_data *pe); -int +MBFLAPI extern int mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe); -mbfl_string * +MBFLAPI extern mbfl_string * mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result); -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_mime_header_encode( mbfl_string *string, mbfl_string *result, enum mbfl_no_encoding outcode, @@ -254,19 +247,19 @@ */ struct mime_header_decoder_data; /* forward declaration */ -struct mime_header_decoder_data * +MBFLAPI extern struct mime_header_decoder_data * mime_header_decoder_new(enum mbfl_no_encoding outcode); -void +MBFLAPI extern void mime_header_decoder_delete(struct mime_header_decoder_data *pd); -int +MBFLAPI extern int mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd); -mbfl_string * +MBFLAPI extern mbfl_string * mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result); -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_mime_header_decode( mbfl_string *string, mbfl_string *result, @@ -276,14 +269,14 @@ /* * convert HTML numeric entity */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_html_numeric_entity(mbfl_string *string, mbfl_string *result, int *convmap, int mapsize, int type); /* * convert of harfwidth and fullwidth for japanese */ -mbfl_string * +MBFLAPI extern mbfl_string * mbfl_ja_jp_hantozen(mbfl_string *string, mbfl_string *result, int mode); /* Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h Sun Aug 24 21:44:16 2003 @@ -31,8 +31,9 @@ #ifndef MBFL_MBFILTER_8BIT_H #define MBFL_MBFILTER_8BIT_H +#include "mbfl_defs.h" #include "mbfilter.h" -extern const mbfl_encoding mbfl_encoding_8bit; +MBFLAPI extern const mbfl_encoding mbfl_encoding_8bit; #endif /* MBFL_MBFILTER_8BIT_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h Sun Aug 24 21:44:16 2003 @@ -30,11 +30,12 @@ #ifndef MBFL_MBFILTER_PASS_H #define MBFL_MBFILTER_PASS_H +#include "mbfl_defs.h" #include "mbfilter.h" -extern const mbfl_encoding mbfl_encoding_pass; -extern const struct mbfl_convert_vtbl vtbl_pass; +MBFLAPI extern const mbfl_encoding mbfl_encoding_pass; +MBFLAPI extern const struct mbfl_convert_vtbl vtbl_pass; -int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter); +MBFLAPI extern int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_PASS_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h Sun Aug 24 21:44:16 2003 @@ -31,8 +31,9 @@ #ifndef MBFL_MBFILTER_WCHAR_H #define MBFL_MBFILTER_WCHAR_H +#include "mbfl_defs.h" #include "mbfilter.h" -extern const mbfl_encoding mbfl_encoding_wchar; +MBFLAPI extern const mbfl_encoding mbfl_encoding_wchar; #endif /* MBFL_MBFILTER_WCHAR_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,8 @@ #ifndef MBFL_ALLOCATORS_H #define MBFL_ALLOCATORS_H +#include "mbfl_defs.h" + typedef struct _mbfl_allocators { void *(*malloc)(unsigned int); void *(*realloc)(void *, unsigned int); @@ -41,7 +43,7 @@ void (*pfree)(void *); } mbfl_allocators; -extern mbfl_allocators *__mbfl_allocators; +MBFLAPI extern mbfl_allocators *__mbfl_allocators; #define mbfl_malloc __mbfl_allocators->malloc #define mbfl_realloc __mbfl_allocators->realloc Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,7 @@ #ifndef MBFL_CONVERT_H #define MBFL_CONVERT_H +#include "mbfl_defs.h" #include "mbfl_encoding.h" #include "mbfl_memory_device.h" @@ -61,28 +62,28 @@ int (*filter_flush)(mbfl_convert_filter *filter); }; -extern const struct mbfl_convert_vtbl *mbfl_convert_filter_list[]; +MBFLAPI extern const struct mbfl_convert_vtbl *mbfl_convert_filter_list[]; -mbfl_convert_filter *mbfl_convert_filter_new( +MBFLAPI extern mbfl_convert_filter *mbfl_convert_filter_new( enum mbfl_no_encoding from, enum mbfl_no_encoding to, int (*output_function)(int, void *), int (*flush_function)(void *), void *data ); -void mbfl_convert_filter_delete(mbfl_convert_filter *filter); -int mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter); -int mbfl_convert_filter_flush(mbfl_convert_filter *filter); -void mbfl_convert_filter_reset(mbfl_convert_filter *filter, enum mbfl_no_encoding from, enum mbfl_no_encoding to); -void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist); -int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter); -void mbfl_convert_filter_select_vtbl(mbfl_convert_filter *filter); -const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to); - -void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter); -int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter); -void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter); +MBFLAPI extern void mbfl_convert_filter_delete(mbfl_convert_filter *filter); +MBFLAPI extern int mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter); +MBFLAPI extern int mbfl_convert_filter_flush(mbfl_convert_filter *filter); +MBFLAPI extern void mbfl_convert_filter_reset(mbfl_convert_filter *filter, enum mbfl_no_encoding from, enum mbfl_no_encoding to); +MBFLAPI extern void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist); +MBFLAPI extern int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter); +MBFLAPI extern void mbfl_convert_filter_select_vtbl(mbfl_convert_filter *filter); +MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to); + +MBFLAPI extern void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter); +MBFLAPI extern int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter); +MBFLAPI extern void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter); -int mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src); -int mbfl_convert_filter_strcat(mbfl_convert_filter *filter, const unsigned char *p); +MBFLAPI extern int mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src); +MBFLAPI extern int mbfl_convert_filter_strcat(mbfl_convert_filter *filter, const unsigned char *p); #endif /* MBFL_CONVERT_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,8 @@ #ifndef MBFL_ENCODING_H #define MBFL_ENCODING_H +#include "mbfl_defs.h" + enum mbfl_no_encoding { mbfl_no_encoding_invalid = -1, mbfl_no_encoding_pass, @@ -112,12 +114,12 @@ unsigned int flag; } mbfl_encoding; -const mbfl_encoding * mbfl_name2encoding(const char *name); -const mbfl_encoding * mbfl_no2encoding(enum mbfl_no_encoding no_encoding); -enum mbfl_no_encoding mbfl_name2no_encoding(const char *name); -const char * mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding); -const char * mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding); -int mbfl_is_support_encoding(const char *name); +MBFLAPI extern const mbfl_encoding * mbfl_name2encoding(const char *name); +MBFLAPI extern const mbfl_encoding * mbfl_no2encoding(enum mbfl_no_encoding no_encoding); +MBFLAPI extern enum mbfl_no_encoding mbfl_name2no_encoding(const char *name); +MBFLAPI extern const char * mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding); +MBFLAPI extern const char * mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding); +MBFLAPI extern int mbfl_is_support_encoding(const char *name); #endif /* MBFL_ENCODING_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h Sun Aug 24 21:44:16 2003 @@ -31,7 +31,7 @@ #ifndef MBFL_FILTER_OUTPUT_H #define MBFL_FILTER_OUTPUT_H -int mbfl_filter_output_pipe(int c, void* data); -int mbfl_filter_output_null(int c, void* data); +MBFLAPI extern int mbfl_filter_output_pipe(int c, void* data); +MBFLAPI extern int mbfl_filter_output_null(int c, void* data); #endif /* MBFL_FILTER_OUTPUT_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,7 @@ #ifndef MBFL_IDENT_H #define MBFL_IDENT_H +#include "mbfl_defs.h" #include "mbfl_encoding.h" /* @@ -55,17 +56,17 @@ int (*filter_function)(int c, mbfl_identify_filter *filter); }; -void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const struct mbfl_identify_vtbl *vtbl); -const struct mbfl_identify_vtbl * mbfl_identify_filter_get_vtbl(enum mbfl_no_encoding encoding); -void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter); -mbfl_identify_filter * mbfl_identify_filter_new(enum mbfl_no_encoding encoding); -void mbfl_identify_filter_delete(mbfl_identify_filter *filter); - -void mbfl_filt_ident_common_ctor(mbfl_identify_filter *filter); -void mbfl_filt_ident_common_dtor(mbfl_identify_filter *filter); -void mbfl_filt_ident_false_ctor(mbfl_identify_filter *filter); +MBFLAPI extern void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const struct mbfl_identify_vtbl *vtbl); +MBFLAPI extern const struct mbfl_identify_vtbl * mbfl_identify_filter_get_vtbl(enum mbfl_no_encoding encoding); +MBFLAPI extern void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter); +MBFLAPI extern mbfl_identify_filter * mbfl_identify_filter_new(enum mbfl_no_encoding encoding); +MBFLAPI extern void mbfl_identify_filter_delete(mbfl_identify_filter *filter); + +MBFLAPI extern void mbfl_filt_ident_common_ctor(mbfl_identify_filter *filter); +MBFLAPI extern void mbfl_filt_ident_common_dtor(mbfl_identify_filter *filter); +MBFLAPI extern void mbfl_filt_ident_false_ctor(mbfl_identify_filter *filter); -int mbfl_filt_ident_false(int c, mbfl_identify_filter *filter); -int mbfl_filt_ident_true(int c, mbfl_identify_filter *filter); +MBFLAPI extern int mbfl_filt_ident_false(int c, mbfl_identify_filter *filter); +MBFLAPI extern int mbfl_filt_ident_true(int c, mbfl_identify_filter *filter); #endif /* MBFL_IDENT_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,7 @@ #ifndef MBFL_LANGUAGE_H #define MBFL_LANGUAGE_H +#include "mbfl_defs.h" #include "mbfl_encoding.h" enum mbfl_no_language { @@ -74,10 +75,10 @@ enum mbfl_no_encoding mail_body_encoding; } mbfl_language; -const mbfl_language * mbfl_name2language(const char *name); -const mbfl_language * mbfl_no2language(enum mbfl_no_language no_language); -enum mbfl_no_language mbfl_name2no_language(const char *name); -const char * mbfl_no_language2name(enum mbfl_no_language no_language); +MBFLAPI extern const mbfl_language * mbfl_name2language(const char *name); +MBFLAPI extern const mbfl_language * mbfl_no2language(enum mbfl_no_language no_language); +MBFLAPI extern enum mbfl_no_language mbfl_name2no_language(const char *name); +MBFLAPI extern const char * mbfl_no_language2name(enum mbfl_no_language no_language); #endif /* MBFL_LANGUAGE_H */ Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,7 @@ #ifndef MBFL_MEMORY_DEVICE_H #define MBFL_MEMORY_DEVICE_H +#include "mbfl_defs.h" #include "mbfl_string.h" #define MBFL_MEMORY_DEVICE_ALLOC_SIZE 64 @@ -49,20 +50,22 @@ int allocsz; } mbfl_wchar_device; -void mbfl_memory_device_init(mbfl_memory_device *device, int initsz, int allocsz); -void mbfl_memory_device_realloc(mbfl_memory_device *device, int initsz, int allocsz); -void mbfl_memory_device_clear(mbfl_memory_device *device); -void mbfl_memory_device_reset(mbfl_memory_device *device); -mbfl_string * mbfl_memory_device_result(mbfl_memory_device *device, mbfl_string *result); -int mbfl_memory_device_output(int c, void *data); -int mbfl_memory_device_output2(int c, void *data); -int mbfl_memory_device_output4(int c, void *data); -int mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc); -int mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, int len); -int mbfl_memory_device_devcat(mbfl_memory_device *dest, mbfl_memory_device *src); +MBFLAPI extern void mbfl_memory_device_init(mbfl_memory_device *device, int initsz, int allocsz); +MBFLAPI extern void mbfl_memory_device_realloc(mbfl_memory_device *device, int initsz, int allocsz); +MBFLAPI extern void mbfl_memory_device_clear(mbfl_memory_device *device); +MBFLAPI extern void mbfl_memory_device_reset(mbfl_memory_device *device); +MBFLAPI extern mbfl_string * mbfl_memory_device_result(mbfl_memory_device *device, mbfl_string *result); +MBFLAPI extern void mbfl_memory_device_unput(mbfl_memory_device *device); +MBFLAPI extern int mbfl_memory_device_output(int c, void *data); +MBFLAPI extern int mbfl_memory_device_output2(int c, void *data); +MBFLAPI extern int mbfl_memory_device_output4(int c, void *data); +MBFLAPI extern int mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc); +MBFLAPI extern int mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, int len); +MBFLAPI extern int mbfl_memory_device_devcat(mbfl_memory_device *dest, mbfl_memory_device *src); -void mbfl_wchar_device_init(mbfl_wchar_device *device); -int mbfl_wchar_device_output(int c, void *data); +MBFLAPI extern void mbfl_wchar_device_init(mbfl_wchar_device *device); +MBFLAPI extern int mbfl_wchar_device_output(int c, void *data); +MBFLAPI extern void mbfl_wchar_device_clear(mbfl_wchar_device *device); Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_string.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_string.h:1.1 php-src/ext/mbstring/libmbfl/mbfl/mbfl_string.h:1.2 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_string.h:1.1 Sat Aug 23 02:18:38 2003 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_string.h Sun Aug 24 21:44:16 2003 @@ -31,6 +31,7 @@ #ifndef MBFL_STRING_H #define MBFL_STRING_H +#include "mbfl_defs.h" #include "mbfl_encoding.h" #include "mbfl_language.h" @@ -44,9 +45,9 @@ unsigned int len; } mbfl_string; -void mbfl_string_init(mbfl_string *string); -void mbfl_string_init_set(mbfl_string *string, mbfl_language_id no_language, mbfl_encoding_id no_encoding); -void mbfl_string_clear(mbfl_string *string); +MBFLAPI extern void mbfl_string_init(mbfl_string *string); +MBFLAPI extern void mbfl_string_init_set(mbfl_string *string, mbfl_language_id no_language, mbfl_encoding_id no_encoding); +MBFLAPI extern void mbfl_string_clear(mbfl_string *string); #ifndef NULL #define NULL 0 Index: php-src/ext/mbstring/libmbfl/nls/.cvsignore diff -u php-src/ext/mbstring/libmbfl/nls/.cvsignore:1.1 php-src/ext/mbstring/libmbfl/nls/.cvsignore:1.2 --- php-src/ext/mbstring/libmbfl/nls/.cvsignore:1.1 Sat Aug 23 02:20:58 2003 +++ php-src/ext/mbstring/libmbfl/nls/.cvsignore Sun Aug 24 21:44:17 2003 @@ -1,13 +1,8 @@ -*.lo -*.la +Makefile +Makefile.in .deps -*.plg -*.opt -*.ncb -Release -Release_inline -Debug -Release_TS -Release_TSDbg -Release_TS_inline -Debug_TS +.libs +*.la +*.a +*.o +*.lo Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_defs.h /* * "streamable kanji code filter and converter" * Copyright (c) 1998-2002 HappySize, Inc. All rights reserved. * * LICENSE NOTICES * * This file is part of "streamable kanji code filter and converter", * which is distributed under the terms of GNU Lesser General Public * License (version 2) as published by the Free Software Foundation. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with "streamable kanji code filter and converter"; * if not, write to the Free Software Foundation, Inc., 59 Temple Place, * Suite 330, Boston, MA 02111-1307 USA * * The author of this file: * */ /* * The source code included in this files was separated from mbfilter.h * by Moriyoshi Koizumi <moriyoshi@php.net> on 20 Dec 2002. The file * mbfilter.h is included in this package . * */ #ifndef MBFL_DEFS_H #define MBFL_DEFS_H #ifndef NULL #ifdef __cplusplus #define NULL (0L) #else #define NULL (void *)(0L) #endif #endif #ifdef WIN32 #ifdef MBFL_DLL_EXPORT #define MBFLAPI __declspec(dllexport) #else #define MBFLAPI __declspec(dllimport) #endif #else #define MBFLAPI #endif #endif /* MBFL_DEFS_H */