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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fc12b75d38..3a836c3460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 22 15:38:43 2018  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	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@ruby-lang.org>
 
 	merge https://github.com/ruby/openssl/commit/3af2635f117f8da563d180bc1c58702aecb16e0c
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index ba68296fd0..25819fbc46 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -19,7 +19,7 @@ module Fiddle
     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
     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()
diff --git a/version.h b/version.h
index 97e7eaec2d..9257e54d9b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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