From: Moriyoshi Koizumi Date: Wed, 23 Feb 2005 13:35:34 +0000 (+0000) Subject: - Synch with the latest checkouts. (include fix by Joe Orton. Thanks.) X-Git-Tag: RELEASE_0_3~231 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2627b51077c5a2ad937f044d51256178b5d01ef;p=php - Synch with the latest checkouts. (include fix by Joe Orton. Thanks.) --- diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index ea2ca5632d..a33991058c 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -605,7 +605,7 @@ mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, i } } -const enum mbfl_no_encoding +enum mbfl_no_encoding mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, int elistsz) { const mbfl_encoding *encoding; diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.h b/ext/mbstring/libmbfl/mbfl/mbfilter.h index eadae7b3f4..d0965251ad 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.h @@ -162,7 +162,7 @@ mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int el MBFLAPI extern const char * mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, int elistsz, int strict); -MBFLAPI extern const enum mbfl_no_encoding +MBFLAPI extern enum mbfl_no_encoding mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, int elistsz); /*