fix on Windows64. https://bugs.php.net/64769

diff --git a/oniguruma.h b/oniguruma.h
index 82787af2171ab102915e0f661d814aca7660838c..206d93a4f0fbcd47acc5907db52a90f53bdd0e48 100644 (file)
--- a/oniguruma.h
+++ b/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/st.h b/st.h
index da65e7fef83049c067e47ef10fad118f23693c03..6f93870214593820d70f5b20e0949378a18c4063 100644 (file)
--- a/st.h
+++ b/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;