diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2003-08-23 08:26:46 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2003-08-23 08:26:46 +0000 |
| commit | c8b525859d85e9b0c8c56ae621036d9fbfd37469 (patch) | |
| tree | 4ea0f3b015e3a3f59d2dd705951895fd1a3598a1 /ext/mbstring | |
| parent | e4f5e1da6d5665bb7d2c0a09d210a971ea820694 (diff) | |
| download | php-git-c8b525859d85e9b0c8c56ae621036d9fbfd37469.tar.gz | |
strcasecmp macro moved to mbfl_compat.h.
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/libmbfl/config.h.vc6 | 1 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_allocators.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_compat.h | 3 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_convert.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_encoding.c | 1 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_language.c | 1 |
6 files changed, 7 insertions, 3 deletions
diff --git a/ext/mbstring/libmbfl/config.h.vc6 b/ext/mbstring/libmbfl/config.h.vc6 index aaa5a5c299..9379061dff 100644 --- 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 be9d345b06..697e6c7919 100644 --- 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 index 0000000000..0197e9047d --- /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 2b9090eb59..17629d10e4 100644 --- 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 a30a8f3810..07b94d6f6d 100644 --- 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 2a8146b84f..0f7e612fef 100644 --- 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" |