2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5020cfa762..a62ea61211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regint.h (OnigStackIndex): the type should be intptr_t.
+	  Original Oniguruma assumes the size of long and that of void *
+	  are equal, but it's not true on LLP64 platform: mswin64.
+	  originally patched by shintaro kuwamoto [ruby-dev:42133]
+
 Thu Aug 26 10:38:11 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
 
 	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
diff --git a/regint.h b/regint.h
index 633cd885c6..ca9f2b12c8 100644
--- a/regint.h
+++ b/regint.h
@@ -720,7 +720,7 @@ typedef struct {
   BBuf*  mbuf;   /* multi-byte info or NULL */
 } CClassNode;
 
-typedef long OnigStackIndex;
+typedef intptr_t OnigStackIndex;
 
 typedef struct _OnigStackType {
   unsigned int type;