2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bbeed8a2f7..edd3028913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
+
+	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
+	  [ruby-core:06721]
+
 Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* intern.h, file.c: failed to compile on windows.
@@ -74,6 +79,7 @@ Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
 	  fixed: [ruby-talk:166520]
 
+>>>>>>> 1.2673.2.1407
 Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
diff --git a/re.c b/re.c
index ab60aba1c1..ed51ee4838 100644
--- a/re.c
+++ b/re.c
@@ -105,7 +105,7 @@ rb_memsearch(x0, m, y0, n)
     int d;
     unsigned long hx, hy;
 
-#define KR_REHASH(a, b, h) (((h) << 1) - ((a)<<d) + (b))
+#define KR_REHASH(a, b, h) (((h) << 1) - (((unsigned long)(a))<<d) + (b))
 
     if (m > n) return -1;
     s = y; e = s + n - m;