akr	2013-05-18 20:28:51 +0900 (Sat, 18 May 2013)

  New Revision: 40811

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

  Log:
    * ext/socket/mkconstants.rb (INTEGER2NUM): Make less comparisons.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/mkconstants.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40810)
+++ ChangeLog	(revision 40811)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat May 18 20:28:12 2013  Tanaka Akira  <akr@f...>
+
+	* ext/socket/mkconstants.rb (INTEGER2NUM): Make less comparisons.
+
 Sat May 18 20:15:28 2013  NARUSE, Yui  <naruse@r...>
 
 	* string.c (str_scrub_bang): add String#scrub!. [Feature #8414]
Index: ext/socket/mkconstants.rb
===================================================================
--- ext/socket/mkconstants.rb	(revision 40810)
+++ ext/socket/mkconstants.rb	(revision 40811)
@@ -280,13 +280,15 @@ result = ERB.new(<<'EOS', nil, '%').resu https://github.com/ruby/ruby/blob/trunk/ext/socket/mkconstants.rb#L280
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
 
 #ifdef HAVE_LONG_LONG
-#define INTEGER2NUM(n) (0 < (n) ? \
-    ((n) <= FIXNUM_MAX ? LONG2FIX(n) : ULL2NUM(n)) : \
-    (FIXNUM_MIN <= (LONG_LONG)(n) ? LONG2FIX(n) : LL2NUM(n)))
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULL2NUM(n) : \
+     FIXNUM_MIN > (LONG_LONG)(n) ? LL2NUM(n) : \
+     LONG2FIX(n))
 #else
-#define INTEGER2NUM(n) (0 < (n) ? \
-    ((n) <= FIXNUM_MAX ? LONG2FIX(n) : ULONG2NUM(n)) : \
-    (FIXNUM_MIN <= (long)(n) ? LONG2FIX(n) : LONG2NUM(n)))
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULONG2NUM(n) : \
+     FIXNUM_MIN > (long)(n) ? LONG2NUM(n) : \
+     LONG2FIX(n))
 #endif
 
 static void

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