yugui	2009-11-02 00:48:23 +0900 (Mon, 02 Nov 2009)

  New Revision: 25619

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25619

  Log:
    merges r24888 from trunk into ruby_1_9_1.
    --
    * include/ruby/ruby.h (SYM2ID): needs parens.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/ruby.h
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/include/ruby/ruby.h
===================================================================
--- ruby_1_9_1/include/ruby/ruby.h	(revision 25618)
+++ ruby_1_9_1/include/ruby/ruby.h	(revision 25619)
@@ -258,7 +258,7 @@
 
 #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 {
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25618)
+++ ruby_1_9_1/ChangeLog	(revision 25619)
@@ -1,3 +1,11 @@
+Sun Sep 13 12:07:49 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/prime.rb (EratosthenesGenerator#initialize): call super.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25618)
+++ ruby_1_9_1/version.h	(revision 25619)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/