usa	2018-03-22 15:38:48 +0900 (Thu, 22 Mar 2018)

  New Revision: 62886

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

  Log:
    merge revision(s) 57081:
    
    Removed the obstacle to running test-all with VC14.
    
    * test/fiddle/test_import.rb (LIBC.fprintf): VC14's `fprintf` is very distinct
      name, then, just ignore this test.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/test/fiddle/test_import.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62885)
+++ ruby_2_3/ChangeLog	(revision 62886)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Mar 22 15:38:43 2018  NAKAMURA Usaku  <usa@r...>
+
+	Removed the obstacle to running test-all with VC14.
+
+	* test/fiddle/test_import.rb (LIBC.fprintf): VC14's `fprintf` is very distinct
+	  name, then, just ignore this test.
+
 Thu Mar 22 12:28:23 2018  NAKAMURA Usaku  <usa@r...>
 
 	merge https://github.com/ruby/openssl/commit/3af2635f117f8da563d180bc1c58702aecb16e0c
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62885)
+++ ruby_2_3/version.h	(revision 62886)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-22"
-#define RUBY_PATCHLEVEL 432
+#define RUBY_PATCHLEVEL 433
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/test/fiddle/test_import.rb
===================================================================
--- ruby_2_3/test/fiddle/test_import.rb	(revision 62885)
+++ ruby_2_3/test/fiddle/test_import.rb	(revision 62886)
@@ -19,7 +19,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/fiddle/test_import.rb#L19
     extern "double atof(string)"
     extern "unsigned long strtoul(char*, char **, int)"
     extern "int qsort(void*, unsigned long, unsigned long, void*)"
-    extern "int fprintf(FILE*, char*)"
+    extern "int fprintf(FILE*, char*)" rescue nil
     extern "int gettimeofday(timeval*, timezone*)" rescue nil
 
     BoundQsortCallback = bind("void *bound_qsort_callback(void*, void*)"){|ptr1,ptr2| ptr1[0] <=> ptr2[0]}
@@ -84,7 +84,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/fiddle/test_import.rb#L84
     end
 
     def test_io()
-      if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM )
+      if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM ) || !defined?(LIBC.fprintf)
         return
       end
       io_in,io_out = IO.pipe()
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62885)
+++ ruby_2_3	(revision 62886)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57081

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