From 23ac4daa04c860db436d8b4fa7074d7173e43d15 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Nov 2009 15:48:23 +0000
Subject: merges r24888 from trunk into ruby_1_9_1. -- * include/ruby/ruby.h
 (SYM2ID): needs parens.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 8 ++++++++
 include/ruby/ruby.h | 2 +-
 version.h           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26e68dcf6..961769560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Sep 13 12:07:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (SYM2ID): needs parens.
+
+	* include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
+	  (LONG2NUM, ULONG2NUM, NUM2CHR, rb_type_p, rb_special_const_p):
+	  GCC specific optimization.
+
 Sun Sep 13 09:38:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/prime.rb (EratosthenesGenerator#initialize): call super.
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index e098f38cc..eff93e96d 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -258,7 +258,7 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
 
 #define SYMBOL_P(x) (((VALUE)(x)&~(~(VALUE)0<<RUBY_SPECIAL_SHIFT))==SYMBOL_FLAG)
 #define ID2SYM(x) (((VALUE)(x)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
-#define SYM2ID(x) RSHIFT((unsigned long)x,RUBY_SPECIAL_SHIFT)
+#define SYM2ID(x) RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT)
 
 /* special constants - i.e. non-zero and non-fixnum constants */
 enum ruby_special_consts {
diff --git a/version.h b/version.h
index b0cca7a7f..c41301db3 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 329
+#define RUBY_PATCHLEVEL 330
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-- 
cgit