yugui	2010-10-02 20:20:21 +0900 (Sat, 02 Oct 2010)

  New Revision: 29392

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29392

  Log:
    merges r29102 from trunk into ruby_1_9_2. fixes #3743.
    --
    * 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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/regint.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29391)
+++ ruby_1_9_2/ChangeLog	(revision 29392)
@@ -1,3 +1,10 @@
+Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
Index: ruby_1_9_2/regint.h
===================================================================
--- ruby_1_9_2/regint.h	(revision 29391)
+++ ruby_1_9_2/regint.h	(revision 29392)
@@ -716,7 +716,7 @@
   BBuf*  mbuf;   /* multi-byte info or NULL */
 } CClassNode;
 
-typedef long OnigStackIndex;
+typedef intptr_t OnigStackIndex;
 
 typedef struct _OnigStackType {
   unsigned int type;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29391)
+++ ruby_1_9_2/version.h	(revision 29392)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-10-02"
-#define RUBY_PATCHLEVEL 12
+#define RUBY_PATCHLEVEL 13
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/