strcasecmp macro moved to mbfl_compat.h.

diff --git a/ext/mbstring/libmbfl/config.h.vc6 b/ext/mbstring/libmbfl/config.h.vc6
index aaa5a5c2992533a5a9fc35385e39426d2e09a06a..9379061dff42a78b0346ba09ee7967aae72979f9 100644 (file)
--- a/ext/mbstring/libmbfl/config.h.vc6
+++ b/ext/mbstring/libmbfl/config.h.vc6
@@ -11,4 +11,3 @@
 #define USE_WIN32_NATIVE_THREAD 1
 #define ENABLE_THREADS 1
 
-#define strcasecmp(s1, s2) stricmp(s1, s2)

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
index be9d345b06166914ea97c21859b93ebcfb949c45..697e6c79192f0234fc34062719f0b54277edfe47 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../config.h"
 #endif
 
 #ifdef HAVE_STDLIB_H

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_compat.h b/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
new file mode 100644 (file)
index 0000000..0197e90
--- /dev/null
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_compat.h
@@ -0,0 +1,3 @@
+#ifndef HAVE_STRCASECMP
+#define strcasecmp(s1, s2) stricmp(s1, s2)
+#endif

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
index 2b9090eb59e6884c0a6e06c5719714a501d9261e..17629d10e4ceeb79be3323d3c6ba23221654db7a 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../config.h"
 #endif
 
 #ifdef HAVE_STDDEF_H

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
index a30a8f3810176f85fbdec22413768aa05feeccf6..07b94d6f6dce5440634553b71f97501ba0a81be2 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -44,6 +44,7 @@
 #include <strings.h>
 #endif
 
+#include "mbfl_compat.h"
 #include "mbfl_encoding.h"
 #include "mbfilter_pass.h"
 #include "mbfilter_8bit.h"

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
index 2a8146b84f09fceb0e7f327d75db55d61ade5e5f..0f7e612fef1fa05713b8cdb8054a971162b21266 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c
@@ -50,6 +50,7 @@
 
 #include "mbfl_encoding.h"
 #include "mbfl_language.h"
+#include "mbfl_compat.h"
 
 #include "nls/nls_ja.h"
 #include "nls/nls_kr.h"