diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2003-09-23 02:43:04 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2003-09-23 02:43:04 +0000 |
| commit | 25bb0d16a9eee5dc02576de7d3be04233ed53b64 (patch) | |
| tree | c4d4cf98ed9ce0d7cdd7b1489566e1e9bf0c7c3e /ext/mbstring/mbstring.c | |
| parent | c8db2e0455050b1ff184983739045cae164390a7 (diff) | |
| download | php-git-25bb0d16a9eee5dc02576de7d3be04233ed53b64.tar.gz | |
fixed win32-build and update e-mail address in mbstring.
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 281d41e04d..5170d490d2 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -95,7 +95,7 @@ static const enum mbfl_no_encoding php_mb_default_identify_list[] = { }; #endif -#if defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) +#if defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA) static const enum mbfl_no_encoding php_mb_default_identify_list[] = { mbfl_no_encoding_ascii, mbfl_no_encoding_utf8, @@ -104,7 +104,7 @@ static const enum mbfl_no_encoding php_mb_default_identify_list[] = { }; #endif -#if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) +#if defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA) static const enum mbfl_no_encoding php_mb_default_identify_list[] = { mbfl_no_encoding_ascii, mbfl_no_encoding_utf8, @@ -113,7 +113,7 @@ static const enum mbfl_no_encoding php_mb_default_identify_list[] = { }; #endif -#if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) +#if defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA) static const enum mbfl_no_encoding php_mb_default_identify_list[] = { mbfl_no_encoding_ascii, mbfl_no_encoding_utf8, @@ -122,7 +122,7 @@ static const enum mbfl_no_encoding php_mb_default_identify_list[] = { }; #endif -#if defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) +#if defined(HAVE_MBSTR_RU) && !defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA) static const enum mbfl_no_encoding php_mb_default_identify_list[] = { mbfl_no_encoding_ascii, mbfl_no_encoding_utf8, @@ -132,7 +132,7 @@ static const enum mbfl_no_encoding php_mb_default_identify_list[] = { }; #endif -#if !defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) +#if !defined(HAVE_MBSTR_RU) && !defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA) static const enum mbfl_no_encoding php_mb_default_identify_list[] = { mbfl_no_encoding_ascii, mbfl_no_encoding_utf8 |