summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-12 12:13:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-12 12:13:01 +0000
commitd2b4011a9424a8d74c9fed97382c3a29eccd8125 (patch)
tree4aeaf77a3fc159eb75706dbe7bb8da35d35c9487
parentfa1e2d957eb2e1d5efba8d836612ea4e77175fa8 (diff)
ruby.h: OFFT2NUM redefinition
* include/ruby/ruby.h (OFFT2NUM): RUBY_REPLACE_TYPE also defines macro to convert int type to VALUE if found. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f55fb8b3fa..ba052885ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 12 21:12:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (OFFT2NUM): RUBY_REPLACE_TYPE also defines macro
+ to convert int type to VALUE if found.
+
Wed May 8 13:46:52 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* include/ruby/intern.h (rb_iv_set, rb_iv_get): removed. Because
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index aefd563a40..062e3dba98 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -239,6 +239,7 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
#define ULL2NUM(v) rb_ull2inum(v)
#endif
+#ifndef OFFT2NUM
#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
# define OFFT2NUM(v) LL2NUM(v)
#elif SIZEOF_OFF_T == SIZEOF_LONG
@@ -246,6 +247,7 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
#else
# define OFFT2NUM(v) INT2NUM(v)
#endif
+#endif
#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
# define SIZET2NUM(v) ULL2NUM(v)