Moriyoshi Koizumi
moriy****@users*****
2002年 12月 26日 (木) 03:07:18 JST
moriyoshi 02/12/26 03:07:18
Modified: mbfl Makefile.am mbfilter.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
Added: mbfl mbfl_defs.h
Log:
Just a preparation for win32 build
Revision Changes Path
1.10 +1 -1 libmbfl/mbfl/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 24 Dec 2002 17:32:14 -0000 1.9
+++ Makefile.am 25 Dec 2002 18:07:18 -0000 1.10
@@ -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 mbfl_buffer_converter.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_buffer_converter.h mbfl_defs.h
$(libmbfl_filters_la):
$(MAKE) -C `dirname $(libmbfl_filters_la)`
1.13 +28 -54 libmbfl/mbfl/mbfilter.h
Index: mbfilter.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mbfilter.h 25 Dec 2002 17:51:58 -0000 1.12
+++ mbfilter.h 25 Dec 2002 18:07:18 -0000 1.13
@@ -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,93 +118,81 @@
int filter_list_size;
};
-mbfl_encoding_detector * mbfl_encoding_detector_new(mbfl_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);
-mbfl_encoding_id mbfl_encoding_detector_judge(mbfl_encoding_detector *identd);
+MBFLAPI mbfl_encoding_detector * mbfl_encoding_detector_new(mbfl_encoding *elist, int eliztsz);
+MBFLAPI void mbfl_encoding_detector_delete(mbfl_encoding_detector *identd);
+MBFLAPI int mbfl_encoding_detector_feed(mbfl_encoding_detector *identd, mbfl_string *string);
+MBFLAPI mbfl_encoding_id mbfl_encoding_detector_judge(mbfl_encoding_detector *identd);
/*
* encoding converter
*/
-mbfl_string *
-mbfl_convert_encoding(mbfl_string *string, mbfl_string *result, mbfl_encoding_id toenc);
+MBFLAPI mbfl_string *mbfl_convert_encoding(mbfl_string *string, mbfl_string *result, mbfl_encoding_id toenc);
/*
* identify encoding
*/
-const mbfl_encoding *mbfl_identify_encoding(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
+MBFLAPI const mbfl_encoding *mbfl_identify_encoding(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
-const char *mbfl_identify_encoding_name(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
+MBFLAPI const char *mbfl_identify_encoding_name(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
-const mbfl_encoding_id mbfl_identify_encoding_no(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
+MBFLAPI const mbfl_encoding_id mbfl_identify_encoding_no(mbfl_string *string, mbfl_encoding *elist, int eliztsz);
/*
* strlen
*/
-int
-mbfl_strlen(mbfl_string *string);
+MBFLAPI int mbfl_strlen(mbfl_string *string);
/*
* strpos
*/
-int
-mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, int offset, int reverse);
+MBFLAPI int mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, int offset, int reverse);
/*
* substr_count
*/
-int
-mbfl_substr_count(mbfl_string *haystack, mbfl_string *needle);
+MBFLAPI int mbfl_substr_count(mbfl_string *haystack, mbfl_string *needle);
/*
* substr
*/
-mbfl_string *
-mbfl_substr(mbfl_string *string, mbfl_string *result, int from, int length);
+MBFLAPI mbfl_string *mbfl_substr(mbfl_string *string, mbfl_string *result, int from, int length);
/*
* strcut
*/
-mbfl_string *
-mbfl_strcut(mbfl_string *string, mbfl_string *result, int from, int length);
+MBFLAPI mbfl_string *mbfl_strcut(mbfl_string *string, mbfl_string *result, int from, int length);
/*
* strwidth
*/
-int
-mbfl_strwidth(mbfl_string *string);
+MBFLAPI int mbfl_strwidth(mbfl_string *string);
/*
* strimwidth
*/
-mbfl_string *
-mbfl_strimwidth(mbfl_string *string, mbfl_string *marker, mbfl_string *result, int from, int width);
+MBFLAPI mbfl_string *mbfl_strimwidth(mbfl_string *string, mbfl_string *marker, mbfl_string *result, int from, int width);
/*
* MIME header encode
*/
struct mime_header_encoder_data; /* forward declaration */
-struct mime_header_encoder_data *
+MBFLAPI struct mime_header_encoder_data *
mime_header_encoder_new(
mbfl_encoding_id incode,
mbfl_encoding_id outcode,
mbfl_encoding_id encoding);
-void
-mime_header_encoder_delete(struct mime_header_encoder_data *pe);
+MBFLAPI void mime_header_encoder_delete(struct mime_header_encoder_data *pe);
-int
-mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe);
+MBFLAPI int mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe);
-mbfl_string *
-mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result);
+MBFLAPI mbfl_string *mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result);
-mbfl_string *
-mbfl_mime_header_encode(
+MBFLAPI mbfl_string *mbfl_mime_header_encode(
mbfl_string *string, mbfl_string *result,
mbfl_encoding_id outcode,
mbfl_encoding_id encoding,
@@ -223,20 +204,15 @@
*/
struct mime_header_decoder_data; /* forward declaration */
-struct mime_header_decoder_data *
-mime_header_decoder_new(mbfl_encoding_id outcode);
+MBFLAPI struct mime_header_decoder_data *mime_header_decoder_new(mbfl_encoding_id outcode);
-void
-mime_header_decoder_delete(struct mime_header_decoder_data *pd);
+MBFLAPI void mime_header_decoder_delete(struct mime_header_decoder_data *pd);
-int
-mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd);
+MBFLAPI int mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd);
-mbfl_string *
-mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result);
+MBFLAPI mbfl_string *mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result);
-mbfl_string *
-mbfl_mime_header_decode(
+MBFLAPI mbfl_string *mbfl_mime_header_decode(
mbfl_string *string,
mbfl_string *result,
mbfl_encoding_id outcode);
@@ -245,15 +221,13 @@
/*
* convert HTML numeric entity
*/
-mbfl_string *
-mbfl_html_numeric_entity(mbfl_string *string, mbfl_string *result, int *convmap, int mapsize, int type);
+MBFLAPI 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 *
-mbfl_ja_jp_hantozen(mbfl_string *string, mbfl_string *result, int mode);
+MBFLAPI mbfl_string *mbfl_ja_jp_hantozen(mbfl_string *string, mbfl_string *result, int mode);
/*
* HTML Entity table
1.3 +3 -1 libmbfl/mbfl/mbfl_allocators.h
Index: mbfl_allocators.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_allocators.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_allocators.h 24 Dec 2002 18:00:11 -0000 1.2
+++ mbfl_allocators.h 25 Dec 2002 18:07:18 -0000 1.3
@@ -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
1.5 +16 -15 libmbfl/mbfl/mbfl_convert.h
Index: mbfl_convert.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_convert.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mbfl_convert.h 20 Dec 2002 20:30:34 -0000 1.4
+++ mbfl_convert.h 25 Dec 2002 18:07:18 -0000 1.5
@@ -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"
@@ -65,26 +66,26 @@
extern const mbfl_convert_vtbl *mbfl_convert_filter_list[];
-mbfl_convert_filter *mbfl_convert_filter_new(
+MBFLAPI mbfl_convert_filter *mbfl_convert_filter_new(
mbfl_encoding_id from,
mbfl_encoding_id 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, mbfl_encoding_id from, mbfl_encoding_id 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 mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(mbfl_encoding_id from, mbfl_encoding_id 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 void mbfl_convert_filter_delete(mbfl_convert_filter *filter);
+MBFLAPI int mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter);
+MBFLAPI int mbfl_convert_filter_flush(mbfl_convert_filter *filter);
+MBFLAPI void mbfl_convert_filter_reset(mbfl_convert_filter *filter, mbfl_encoding_id from, mbfl_encoding_id to);
+MBFLAPI void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist);
+MBFLAPI int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter);
+MBFLAPI void mbfl_convert_filter_select_vtbl(mbfl_convert_filter *filter);
+MBFLAPI const mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(mbfl_encoding_id from, mbfl_encoding_id to);
+
+MBFLAPI void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter);
+MBFLAPI int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter);
+MBFLAPI 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 int mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src);
+MBFLAPI int mbfl_convert_filter_strcat(mbfl_convert_filter *filter, const unsigned char *p);
#endif /* MBFL_CONVERT_H */
1.4 +8 -6 libmbfl/mbfl/mbfl_encoding.h
Index: mbfl_encoding.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_encoding.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfl_encoding.h 20 Dec 2002 22:15:38 -0000 1.3
+++ mbfl_encoding.h 25 Dec 2002 18:07:18 -0000 1.4
@@ -31,6 +31,8 @@
#ifndef MBFL_ENCODING_H
#define MBFL_ENCODING_H
+#include "mbfl_defs.h"
+
enum _mbfl_encoding_id {
mbfl_encoding_id_invalid = -1,
mbfl_encoding_id_pass,
@@ -113,11 +115,11 @@
const struct _mbfl_identify_vtbl *ident_vtbl;
} mbfl_encoding;
-extern const mbfl_encoding *mbfl_get_encoding_by_name(const char *name);
-extern const mbfl_encoding *mbfl_get_encoding_by_id(mbfl_encoding_id no_encoding);
-extern mbfl_encoding_id mbfl_encoding_get_id_by_name(const char *name);
-extern const char *mbfl_encoding_get_name_by_id(mbfl_encoding_id no_encoding);
-extern const char * mbfl_encoding_get_mime_preferred_name_by_id(mbfl_encoding_id no_encoding);
-extern int mbfl_is_supported_encoding(const char *name);
+MBFLAPI extern const mbfl_encoding *mbfl_get_encoding_by_name(const char *name);
+MBFLAPI extern const mbfl_encoding *mbfl_get_encoding_by_id(mbfl_encoding_id no_encoding);
+MBFLAPI extern mbfl_encoding_id mbfl_encoding_get_id_by_name(const char *name);
+MBFLAPI extern const char *mbfl_encoding_get_name_by_id(mbfl_encoding_id no_encoding);
+MBFLAPI extern const char * mbfl_encoding_get_mime_preferred_name_by_id(mbfl_encoding_id no_encoding);
+MBFLAPI extern int mbfl_is_supported_encoding(const char *name);
#endif /* MBFL_ENCODING_H */
1.2 +4 -2 libmbfl/mbfl/mbfl_filter_output.h
Index: mbfl_filter_output.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_filter_output.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_filter_output.h 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_filter_output.h 25 Dec 2002 18:07:18 -0000 1.2
@@ -31,7 +31,9 @@
#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);
+#include "mbfl_defs.h"
+
+MBFLAPI int mbfl_filter_output_pipe(int c, void* data);
+MBFLAPI int mbfl_filter_output_null(int c, void* data);
#endif /* MBFL_FILTER_OUTPUT_H */
1.6 +12 -10 libmbfl/mbfl/mbfl_ident.h
Index: mbfl_ident.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_ident.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mbfl_ident.h 20 Dec 2002 22:15:38 -0000 1.5
+++ mbfl_ident.h 25 Dec 2002 18:07:18 -0000 1.6
@@ -31,6 +31,8 @@
#ifndef MBFL_IDENT_H
#define MBFL_IDENT_H
+#include "mbfl_defs.h"
+
/*
* identify filter
*/
@@ -55,16 +57,16 @@
int (*filter_function)(int c, mbfl_identify_filter *filter);
};
-void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const mbfl_identify_vtbl *vtbl);
-void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter);
-mbfl_identify_filter * mbfl_identify_filter_new(struct _mbfl_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 void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const mbfl_identify_vtbl *vtbl);
+MBFLAPI void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter);
+MBFLAPI mbfl_identify_filter * mbfl_identify_filter_new(struct _mbfl_encoding *encoding);
+MBFLAPI void mbfl_identify_filter_delete(mbfl_identify_filter *filter);
+
+MBFLAPI void mbfl_filt_ident_common_ctor(mbfl_identify_filter *filter);
+MBFLAPI void mbfl_filt_ident_common_dtor(mbfl_identify_filter *filter);
+MBFLAPI 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 int mbfl_filt_ident_false(int c, mbfl_identify_filter *filter);
+MBFLAPI int mbfl_filt_ident_true(int c, mbfl_identify_filter *filter);
#endif /* MBFL_IDENT_H */
1.3 +5 -4 libmbfl/mbfl/mbfl_language.h
Index: mbfl_language.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_language.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_language.h 20 Dec 2002 20:30:34 -0000 1.2
+++ mbfl_language.h 25 Dec 2002 18:07:18 -0000 1.3
@@ -31,6 +31,7 @@
#ifndef MBFL_LANGUAGE_H
#define MBFL_LANGUAGE_H
+#include "mbfl_defs.h"
#include "mbfl_encoding.h"
enum _mbfl_language_id {
@@ -74,9 +75,9 @@
mbfl_encoding_id mail_body_encoding;
} mbfl_language;
-extern const mbfl_language * mbfl_get_language_by_name(const char *name);
-extern const mbfl_language * mbfl_get_language_by_id(mbfl_language_id no_language);
-extern mbfl_language_id mbfl_language_get_id_by_name(const char *name);
-extern const char * mbfl_language_get_name_by_id(mbfl_language_id no_language);
+MBFLAPI extern const mbfl_language * mbfl_get_language_by_name(const char *name);
+MBFLAPI extern const mbfl_language * mbfl_get_language_by_id(mbfl_language_id no_language);
+MBFLAPI extern mbfl_language_id mbfl_language_get_id_by_name(const char *name);
+MBFLAPI extern const char * mbfl_language_get_name_by_id(mbfl_language_id no_language);
#endif /* MBFL_LANGUAGE_H */
1.3 +16 -15 libmbfl/mbfl/mbfl_memory_device.h
Index: mbfl_memory_device.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_memory_device.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_memory_device.h 20 Dec 2002 22:15:38 -0000 1.2
+++ mbfl_memory_device.h 25 Dec 2002 18:07:18 -0000 1.3
@@ -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,22 +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);
-void mbfl_memory_device_unput(mbfl_memory_device *device);
-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 void mbfl_memory_device_init(mbfl_memory_device *device, int initsz, int allocsz);
+MBFLAPI void mbfl_memory_device_realloc(mbfl_memory_device *device, int initsz, int allocsz);
+MBFLAPI void mbfl_memory_device_clear(mbfl_memory_device *device);
+MBFLAPI void mbfl_memory_device_reset(mbfl_memory_device *device);
+MBFLAPI mbfl_string * mbfl_memory_device_result(mbfl_memory_device *device, mbfl_string *result);
+MBFLAPI void mbfl_memory_device_unput(mbfl_memory_device *device);
+MBFLAPI int mbfl_memory_device_output(int c, void *data);
+MBFLAPI int mbfl_memory_device_output2(int c, void *data);
+MBFLAPI int mbfl_memory_device_output4(int c, void *data);
+MBFLAPI int mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc);
+MBFLAPI int mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, int len);
+MBFLAPI 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);
-void mbfl_wchar_device_clear(mbfl_wchar_device *device);
+MBFLAPI void mbfl_wchar_device_init(mbfl_wchar_device *device);
+MBFLAPI int mbfl_wchar_device_output(int c, void *data);
+MBFLAPI void mbfl_wchar_device_clear(mbfl_wchar_device *device);
#endif /* MBFL_MEMORY_DEVICE_H */
1.3 +4 -3 libmbfl/mbfl/mbfl_string.h
Index: mbfl_string.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_string.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_string.h 20 Dec 2002 20:30:35 -0000 1.2
+++ mbfl_string.h 25 Dec 2002 18:07:18 -0000 1.3
@@ -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,8 +45,8 @@
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 void mbfl_string_init(mbfl_string *string);
+MBFLAPI void mbfl_string_init_set(mbfl_string *string, mbfl_language_id no_language, mbfl_encoding_id no_encoding);
+MBFLAPI void mbfl_string_clear(mbfl_string *string);
#endif /* MBFL_STRING_H */
1.1 libmbfl/mbfl/mbfl_defs.h
Index: 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 <moriy****@php*****> 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 */