From 2e4f2aaaf0e9e245db7f5d2596b4aef4ec0406f8 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 11 Jul 2007 20:35:10 +0000
Subject: [PATCH] 	* include/ruby/ruby.h (FIX2ULONG): drop sign bit for
 LLP64 platform.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 4 ++++
 include/ruby/ruby.h | 2 +-
 version.h           | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58b562db88..e927c6fbdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 12 05:32:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (FIX2ULONG): drop sign bit for LLP64 platform.
+
 Tue Jul 10 19:34:45 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* hash.c (rb_hash_lookup): added.  this function is similar to
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 059c145265..0df42e7314 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -201,7 +201,7 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
 #endif
 
 #define FIX2LONG(x) RSHIFT((SIGNED_VALUE)x,1)
-#define FIX2ULONG(x) (((VALUE)(x))>>1)
+#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
 #define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG)
 #define POSFIXABLE(f) ((f) <= FIXNUM_MAX)
 #define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
diff --git a/version.h b/version.h
index 16ef5483ca..15baccdc0b 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-07-10"
+#define RUBY_RELEASE_DATE "2007-07-12"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070710
+#define RUBY_RELEASE_CODE 20070712
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];