com php-src: fix incompatible types: ext/mbstring/oniguruma/regint.h
| From: | Anatol Belski | Date: | Sat, 15 Aug 2015 10:03:47 +0000 |
| Subject: | com php-src: fix incompatible types: ext/mbstring/oniguruma/regint.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88549@lists.php.net to get a copy of this message | ||
Commit: 46101dbec57c036dfb82587d94dfbcbc71207601
Author: Anatol Belski <ab@php.net> Sat, 15 Aug 2015 12:03:47 +0200
Parents: 3689b44453f12250c8f628a9b81bca3344f41921
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46101dbec57c036dfb82587d94dfbcbc71207601
Log:
fix incompatible types
namely between hash_data_type and st_data_t
Changed paths:
M ext/mbstring/oniguruma/regint.h
Diff:
diff --git a/ext/mbstring/oniguruma/regint.h b/ext/mbstring/oniguruma/regint.h
index 7ab233a..f06154d 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));