merges r28544 from trunk into ruby_1_9_2.

--
* string.c (NONASCII_MASK): NONASCII_MASK must be unsigned.
  [ruby-dev:41782]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a41e1d610..6028ddbcbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  6 00:29:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (NONASCII_MASK): NONASCII_MASK must be unsigned.
+	  [ruby-dev:41782]
+
 Fri Jul  2 19:07:09 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* io.c (argf_inplace_mode_set): prohibits an assignment
diff --git a/string.c b/string.c
index ba4ce86087..8cfbb56bdf 100644
--- a/string.c
+++ b/string.c
@@ -141,7 +141,7 @@ static inline const char *
 search_nonascii(const char *p, const char *e)
 {
 #if SIZEOF_VALUE == 8
-# define NONASCII_MASK 0x8080808080808080LL
+# define NONASCII_MASK 0x8080808080808080ULL
 #elif SIZEOF_VALUE == 4
 # define NONASCII_MASK 0x80808080UL
 #endif