From c75c838e1682a636ec7b4220b2a684194842d2b4 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Jun 2011 01:58:13 +0000
Subject: * file.c (rb_stat_rdev): use DEVT2NUM.

* file.c (rb_stat_rdev_major): ditto.

* file.c (rb_stat_rdev_minor): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 8 ++++++++
 file.c    | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fd1b5db24..83b4d8b32b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 15 10:37:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_stat_rdev): use DEVT2NUM.
+
+	* file.c (rb_stat_rdev_major): ditto.
+
+	* file.c (rb_stat_rdev_minor): ditto.
+
 Wed Jun 15 05:12:59 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's 
diff --git a/file.c b/file.c
index 3746009aae..daba52cde3 100644
--- a/file.c
+++ b/file.c
@@ -489,7 +489,7 @@ static VALUE
 rb_stat_rdev(VALUE self)
 {
 #ifdef HAVE_ST_RDEV
-    return ULONG2NUM(get_stat(self)->st_rdev);
+    return DEVT2NUM(get_stat(self)->st_rdev);
 #else
     return Qnil;
 #endif
@@ -510,8 +510,7 @@ static VALUE
 rb_stat_rdev_major(VALUE self)
 {
 #if defined(HAVE_ST_RDEV) && defined(major)
-    long rdev = get_stat(self)->st_rdev;
-    return ULONG2NUM(major(rdev));
+    return DEVT2NUM(major(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
@@ -532,8 +531,7 @@ static VALUE
 rb_stat_rdev_minor(VALUE self)
 {
 #if defined(HAVE_ST_RDEV) && defined(minor)
-    long rdev = get_stat(self)->st_rdev;
-    return ULONG2NUM(minor(rdev));
+    return DEVT2NUM(minor(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
-- 
cgit v1.2.3