diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-05-27 21:14:24 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-05-27 21:14:24 +0200 |
| commit | f4be957a1c62e8e3a0c3e926ca400e8b0c716338 (patch) | |
| tree | daddcdab6d7314a24900ffc23312db3a6f9fc9ed /ext/mbstring | |
| parent | e421dce5336684f1585c48ee38239b3d649b1770 (diff) | |
| download | php-f4be957a1c62e8e3a0c3e926ca400e8b0c716338.tar.gz | |
Imported Upstream version 5.5.0~rc2+dfsg
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/oniguruma/oniguruma.h | 7 | ||||
| -rw-r--r-- | ext/mbstring/oniguruma/st.h | 5 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_str_functions_opt-parameter.phpt | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ext/mbstring/oniguruma/oniguruma.h b/ext/mbstring/oniguruma/oniguruma.h index 3b557639f..bf00e20f6 100644 --- a/ext/mbstring/oniguruma/oniguruma.h +++ b/ext/mbstring/oniguruma/oniguruma.h @@ -96,8 +96,13 @@ extern "C" { #define UChar OnigUChar #endif -typedef unsigned char OnigUChar; +#ifdef _WIN32 +# include <windows.h> +typedef ULONG_PTR OnigCodePoint; +#else typedef unsigned long OnigCodePoint; +#endif +typedef unsigned char OnigUChar; typedef unsigned int OnigCtype; typedef unsigned int OnigDistance; diff --git a/ext/mbstring/oniguruma/st.h b/ext/mbstring/oniguruma/st.h index da65e7fef..6f9387021 100644 --- a/ext/mbstring/oniguruma/st.h +++ b/ext/mbstring/oniguruma/st.h @@ -6,7 +6,12 @@ #define ST_INCLUDED +#ifdef _WIN32 +# include <windows.h> +typedef ULONG_PTR st_data_t; +#else typedef unsigned long st_data_t; +#endif #define ST_DATA_T_DEFINED typedef struct st_table st_table; diff --git a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt index 5fb642f9b..6219e585e 100644 --- a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt +++ b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt @@ -1,5 +1,7 @@ --TEST-- Optional long parameter might be null +--SKIPIF-- +<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- <?php echo mb_strpos('abb', 'b', null, 'UTF-8') . "\n"; |