usa	2015-11-18 20:57:07 +0900 (Wed, 18 Nov 2015)

  New Revision: 52645

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

  Log:
    merge revision(s) 50104,50105: [Backport #10906]
    
    * ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906]
      ruby itself (including numeric.c) is built with strict compile
      options including -std=iso9899:1999, but ext/date is not.
      By the way -std=iso9899:1999 is not only a warning option but also
      changes behavior like MACRO definitions for example INFINITY.
      gcc on Solaris affect this.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/date/extconf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 52644)
+++ ruby_2_1/ChangeLog	(revision 52645)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Nov 18 20:56:50 2015  NARUSE, Yui  <naruse@r...>
+
+	* ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906]
+	  ruby itself (including numeric.c) is built with strict compile
+	  options including -std=iso9899:1999, but ext/date is not.
+	  By the way -std=iso9899:1999 is not only a warning option but also
+	  changes behavior like MACRO definitions for example INFINITY.
+	  gcc on Solaris affect this.
+
 Wed Nov 18 20:38:15 2015  Zachary Scott  <zzak@r...>
 
 	* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735]
Index: ruby_2_1/ext/date/extconf.rb
===================================================================
--- ruby_2_1/ext/date/extconf.rb	(revision 52644)
+++ ruby_2_1/ext/date/extconf.rb	(revision 52645)
@@ -1,2 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/date/extconf.rb#L1
 require 'mkmf'
+if try_cflags("-std=iso9899:1999")
+  $CFLAGS += " " << "-std=iso9899:1999"
+end
 create_makefile('date_core')
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 52644)
+++ ruby_2_1/version.h	(revision 52645)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.8"
 #define RUBY_RELEASE_DATE "2015-11-18"
-#define RUBY_PATCHLEVEL 420
+#define RUBY_PATCHLEVEL 421
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50104-50105


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