nagachika	2015-11-29 03:16:04 +0900 (Sun, 29 Nov 2015)

  New Revision: 52778

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

  Log:
    merge revision(s) 51242: [Backport #11343]
    
    * gc.c (__has_feature): move into internal.h.
    
    * internal.h (__has_feature): ditto.
    
    * internal.h (__has_extension): new macro.
    
    * internal.h (STATIC_ASSERT): use _Static_assert with
      clang. [ruby-core:69931] [Bug #11343]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/gc.c
    branches/ruby_2_2/internal.h
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52777)
+++ ruby_2_2/ChangeLog	(revision 52778)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Nov 29 02:55:56 2015  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* gc.c (__has_feature): move into internal.h.
+
+	* internal.h (__has_feature): ditto.
+
+	* internal.h (__has_extension): new macro.
+
+	* internal.h (STATIC_ASSERT): use _Static_assert with
+	  clang. [ruby-core:69931] [Bug #11343]
+
 Sat Nov 28 06:28:55 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
Index: ruby_2_2/gc.c
===================================================================
--- ruby_2_2/gc.c	(revision 52777)
+++ ruby_2_2/gc.c	(revision 52778)
@@ -32,10 +32,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/gc.c#L32
 
 #undef rb_data_object_alloc
 
-#ifndef __has_feature
-# define __has_feature(x) 0
-#endif
-
 #ifndef HAVE_MALLOC_USABLE_SIZE
 # ifdef _WIN32
 #   define HAVE_MALLOC_USABLE_SIZE
Index: ruby_2_2/internal.h
===================================================================
--- ruby_2_2/internal.h	(revision 52777)
+++ ruby_2_2/internal.h	(revision 52778)
@@ -73,7 +73,15 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_2/internal.h#L73
     (__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
     (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
 
-#if GCC_VERSION_SINCE(4, 6, 0)
+#ifndef __has_feature
+# define __has_feature(x) 0
+#endif
+
+#ifndef __has_extension
+# define __has_extension __has_feature
+#endif
+
+#if GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert)
 # define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr)
 #else
 # define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)]
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52777)
+++ ruby_2_2/version.h	(revision 52778)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-28"
-#define RUBY_PATCHLEVEL 206
+#define RUBY_RELEASE_DATE "2015-11-29"
+#define RUBY_PATCHLEVEL 207
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51242


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