cvs: php-src(PHP_5_0) /ext/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h
| From: | Moriyoshi Koizumi | Date: | Wed, 23 Feb 2005 13:35:57 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30549@lists.php.net to get a copy of this message | ||
moriyoshi Wed Feb 23 08:35:57 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h
Log:
- MFH: Synch with the latest checkouts. (include fix by Joe Orton. Thanks.)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.2.2.2&r2=1.2.2.3&ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.2
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.2 Sun Feb 20 18:02:51 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c Wed Feb 23 08:35:57 2005
@@ -605,7 +605,7 @@
}
}
-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;
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3 Wed Feb 4 02:24:07 2004
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h Wed Feb 23 08:35:57 2005
@@ -162,7 +162,7 @@
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);
/*