naruse	2016-01-12 15:22:03 +0900 (Tue, 12 Jan 2016)

  New Revision: 53502

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

  Log:
    merge revision(s) 53493: [Backport #11978]
    
    * include/ruby/missing.h (explicit_bzero_by_memset_s): remove
      inline implementation by memset_s, which needs a macro before
      including headers and can cause problems in extension libraries
      by the order of the macro and headers.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/include/ruby/missing.h
    branches/ruby_2_3/missing/explicit_bzero.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 53501)
+++ ruby_2_3/ChangeLog	(revision 53502)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Jan 12 15:21:00 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/missing.h (explicit_bzero_by_memset_s): remove
+	  inline implementation by memset_s, which needs a macro before
+	  including headers and can cause problems in extension libraries
+	  by the order of the macro and headers.
+
 Thu Dec 24 23:01:57 2015  SHIBATA Hiroshi  <hsbt@r...>
 
 	* NEWS: added entry for CGI.escapeHTML optimization.
Index: ruby_2_3/missing/explicit_bzero.c
===================================================================
--- ruby_2_3/missing/explicit_bzero.c	(revision 53501)
+++ ruby_2_3/missing/explicit_bzero.c	(revision 53502)
@@ -1,5 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/missing/explicit_bzero.c#L1
+#ifndef __STDC_WANT_LIB_EXT1__
+#define __STDC_WANT_LIB_EXT1__ 1
+#endif
+
 #include "ruby/missing.h"
 #include <string.h>
+#ifdef HAVE_MEMSET_S
+# include <string.h>
+#endif
 
 #ifdef _WIN32
 #include <windows.h>
Index: ruby_2_3/include/ruby/missing.h
===================================================================
--- ruby_2_3/include/ruby/missing.h	(revision 53501)
+++ ruby_2_3/include/ruby/missing.h	(revision 53502)
@@ -18,10 +18,6 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_3/include/ruby/missing.h#L18
 #endif
 #endif
 
-#ifndef __STDC_WANT_LIB_EXT1__
-#define __STDC_WANT_LIB_EXT1__ 1
-#endif
-
 #include "ruby/config.h"
 #include <stddef.h>
 #include <math.h> /* for INFINITY and NAN */
@@ -248,15 +244,7 @@ RUBY_EXTERN void setproctitle(const char https://github.com/ruby/ruby/blob/trunk/ruby_2_3/include/ruby/missing.h#L244
 
 #ifndef HAVE_EXPLICIT_BZERO
 RUBY_EXTERN void explicit_bzero(void *b, size_t len);
-# ifdef HAVE_MEMSET_S
-# include <string.h>
-static inline void
-explicit_bzero_by_memset_s(void *b, size_t len)
-{
-    memset_s(b, len, 0, len);
-}
-#   define explicit_bzero(b, len) explicit_bzero_by_memset_s(b, len)
-# elif defined SecureZeroMemory
+# if defined SecureZeroMemory
 #   define explicit_bzero(b, len) SecureZeroMemory(b, len)
 # endif
 #endif
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 53501)
+++ ruby_2_3/version.h	(revision 53502)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2015-12-25"
-#define RUBY_PATCHLEVEL 2
+#define RUBY_RELEASE_DATE "2016-01-12"
+#define RUBY_PATCHLEVEL 3
 
-#define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_YEAR 2016
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53493


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