From 2c4310ffa4a353e0da4c6e8eb2a6958dd7a986e8 Mon Sep 17 00:00:00 2001 From: Tim Bell Date: Fri, 18 Dec 2009 09:40:34 -0800 Subject: [PATCH] 6899737: JDK build fails in make/java/jli because of _vsnprintf macro redefinition Use stdio.h instead when building with Visual Studio 2008 or later Reviewed-by: art, ohair --- jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h index 55e8f36db6e..7f26e625927 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h @@ -220,7 +220,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ -# if !defined(vsnprintf) && !defined(NO_vsnprintf) +# if !defined(vsnprintf) && !defined(NO_vsnprintf) && (!defined(_MSC_VER) || (_MSC_VER < 1500)) + /* Only needed before Visual Studio 2008 */ # define vsnprintf _vsnprintf # endif # endif