diff options
| author | Anatol Belski <ab@php.net> | 2015-08-15 12:03:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-08-15 12:03:47 +0200 |
| commit | 46101dbec57c036dfb82587d94dfbcbc71207601 (patch) | |
| tree | 7415432a970413a4428477acd9b56bd625a5b3c6 | |
| parent | 3689b44453f12250c8f628a9b81bca3344f41921 (diff) | |
| download | php-git-46101dbec57c036dfb82587d94dfbcbc71207601.tar.gz | |
fix incompatible types
namely between hash_data_type and st_data_t
| -rw-r--r-- | ext/mbstring/oniguruma/regint.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/mbstring/oniguruma/regint.h b/ext/mbstring/oniguruma/regint.h index 7ab233aeb4..f06154dda1 100644 --- a/ext/mbstring/oniguruma/regint.h +++ b/ext/mbstring/oniguruma/regint.h @@ -793,7 +793,12 @@ extern int onig_is_code_in_cc_len P_((int enclen, OnigCodePoint code, CClassNod /* strend hash */ typedef void hash_table_type; +#ifdef _WIN32 +# include <windows.h> +typedef ULONG_PTR hash_data_type; +#else typedef unsigned long hash_data_type; +#endif extern hash_table_type* onig_st_init_strend_table_with_size P_((int size)); extern int onig_st_lookup_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value)); |