yugui	2009-06-20 18:05:51 +0900 (Sat, 20 Jun 2009)

  New Revision: 23756

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

  Log:
    merges r23549 from trunk into ruby_1_9_1.
    --
    * ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restrict
      to Fixnum.  [ruby-dev:38533]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/dl/cptr.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23755)
+++ ruby_1_9_1/ChangeLog	(revision 23756)
@@ -1,3 +1,8 @@
+Sat May 23 18:48:52 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restric
+	  to Fixnum.  [ruby-dev:38533]
+
 Fri May 22 18:44:34 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* instruby.rb (rdoc): considers --program-prefix and --program-suffix
Index: ruby_1_9_1/ext/dl/cptr.c
===================================================================
--- ruby_1_9_1/ext/dl/cptr.c	(revision 23755)
+++ ruby_1_9_1/ext/dl/cptr.c	(revision 23756)
@@ -317,10 +317,13 @@
 VALUE
 rb_dlptr_cmp(VALUE self, VALUE other)
 {
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-  return PTR2NUM((long)ptr1 - (long)ptr2);
+    void *ptr1, *ptr2;
+    SIGNED_VALUE diff;
+    ptr1 = rb_dlptr2cptr(self);
+    ptr2 = rb_dlptr2cptr(other);
+    diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
+    if (!diff) return INT2FIX(0);
+    return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
 }
 
 VALUE
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23755)
+++ ruby_1_9_1/version.h	(revision 23756)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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