archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r27555 from trunk into ruby_1_9_1.

Browse source 
--
* numeric.c (fix_mul): the width of fixnum is same as long's on all
  platforms.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-23 13:36:12 +00:00
parent 4e88735997
commit e0e9217547
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (fix_mul): the width of fixnum is same as long's on all
platforms.
Wed Aug 26 13:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 26 13:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the * lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the

8
numeric.c
View file

@ -2132,18 +2132,18 @@ fix_mul(VALUE x, VALUE y)
/* avoids an optimization bug of HP aC++/ANSI C B3910B A.06.05 [Jul 25 2005] */ /* avoids an optimization bug of HP aC++/ANSI C B3910B A.06.05 [Jul 25 2005] */
volatile volatile
#endif #endif
SIGNED_VALUE a, b; long a, b;
#if SIZEOF_VALUE * 2 <= SIZEOF_LONG_LONG #if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
LONG_LONG d; LONG_LONG d;
#else #else
SIGNED_VALUE c; long c;
VALUE r; VALUE r;
#endif #endif
a = FIX2LONG(x); a = FIX2LONG(x);
b = FIX2LONG(y); b = FIX2LONG(y);
#if SIZEOF_VALUE * 2 <= SIZEOF_LONG_LONG #if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
d = (LONG_LONG)a * b; d = (LONG_LONG)a * b;
if (FIXABLE(d)) return LONG2FIX(d); if (FIXABLE(d)) return LONG2FIX(d);
return rb_ll2inum(d); return rb_ll2inum(d);

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 424 #define RUBY_PATCHLEVEL 425
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1