Sync with the original

13 files changed, 606 insertions, 99 deletions

diff --git a/ext/mbstring/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER
index 1aa586050c..97fe77c33c 100644
--- a/ext/mbstring/libmbfl/DISCLAIMER
+++ b/ext/mbstring/libmbfl/DISCLAIMER
@@ -1,4 +1,5 @@
 # charset=UTF-8
+# vim600: encoding=UTF-8
 
  "streamable kanji code filter and converter"
 
diff --git a/ext/mbstring/libmbfl/LICENSE b/ext/mbstring/libmbfl/LICENSE
new file mode 100644
index 0000000000..3b204400cf
--- /dev/null
+++ b/ext/mbstring/libmbfl/LICENSE
@@ -0,0 +1,458 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/ext/mbstring/libmbfl/Makefile.bcc32 b/ext/mbstring/libmbfl/Makefile.bcc32
new file mode 100644
index 0000000000..a740f256ed
--- /dev/null
+++ b/ext/mbstring/libmbfl/Makefile.bcc32
@@ -0,0 +1,31 @@
+!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
+
diff --git a/ext/mbstring/libmbfl/README b/ext/mbstring/libmbfl/README
index cac373227b..d8debc6750 100644
--- a/ext/mbstring/libmbfl/README
+++ b/ext/mbstring/libmbfl/README
@@ -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
diff --git a/ext/mbstring/libmbfl/config.h.vc6 b/ext/mbstring/libmbfl/config.h.vc6
index 96c97053ed..7458e441eb 100644
--- a/ext/mbstring/libmbfl/config.h.vc6
+++ b/ext/mbstring/libmbfl/config.h.vc6
@@ -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
diff --git a/ext/mbstring/libmbfl/filters/Makefile.bcc32 b/ext/mbstring/libmbfl/filters/Makefile.bcc32
new file mode 100644
index 0000000000..4219ed9061
--- /dev/null
+++ b/ext/mbstring/libmbfl/filters/Makefile.bcc32
@@ -0,0 +1,9 @@
+!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
+
diff --git a/ext/mbstring/libmbfl/mbfl.def b/ext/mbstring/libmbfl/mbfl.def
index 4471746f23..e6844f5f88 100644
--- a/ext/mbstring/libmbfl/mbfl.def
+++ b/ext/mbstring/libmbfl/mbfl.def
@@ -3,93 +3,78 @@ LIBRARY mbfl.dll
 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
diff --git a/ext/mbstring/libmbfl/mbfl.rc b/ext/mbstring/libmbfl/mbfl.rc
index 655e61893a..d6cf7d1436 100644
--- a/ext/mbstring/libmbfl/mbfl.rc
+++ b/ext/mbstring/libmbfl/mbfl.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $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 
diff --git a/ext/mbstring/libmbfl/mbfl/Makefile.bcc32 b/ext/mbstring/libmbfl/mbfl/Makefile.bcc32
new file mode 100644
index 0000000000..5d43e6a6f4
--- /dev/null
+++ b/ext/mbstring/libmbfl/mbfl/Makefile.bcc32
@@ -0,0 +1,7 @@
+!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
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_compat.h b/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
deleted file mode 100644
index 8b13789179..0000000000
--- a/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
index 07b94d6f6d..7f0dc9ab60 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -44,7 +44,6 @@
 #include <strings.h>
 #endif
 
-#include "mbfl_compat.h"
 #include "mbfl_encoding.h"
 #include "mbfilter_pass.h"
 #include "mbfilter_8bit.h"
@@ -96,6 +95,13 @@
 #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};
 
 static const mbfl_encoding mbfl_encoding_auto = {
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
index 0f7e612fef..be1341ab8c 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
@@ -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"
@@ -61,6 +60,12 @@
 #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,
 	&mbfl_language_japanese,
diff --git a/ext/mbstring/libmbfl/nls/Makefile.bcc32 b/ext/mbstring/libmbfl/nls/Makefile.bcc32
new file mode 100644
index 0000000000..9dc641a452
--- /dev/null
+++ b/ext/mbstring/libmbfl/nls/Makefile.bcc32
@@ -0,0 +1,8 @@
+!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