changeset 2044:9956e8d71e06

6899737: JDK build fails in make/java/jli because of _vsnprintf macro redefinition Summary: Use stdio.h instead when building with Visual Studio 2008 or later Reviewed-by: art, ohair
author tbell
date Fri, 18 Dec 2009 09:40:34 -0800
parents 1143e498f813
children 39b9564ff01c
files src/share/native/java/util/zip/zlib-1.2.3/zutil.h
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/java/util/zip/zlib-1.2.3/zutil.h	Wed Dec 16 23:39:21 2009 -0800
+++ b/src/share/native/java/util/zip/zlib-1.2.3/zutil.h	Fri Dec 18 09:40:34 2009 -0800
@@ -220,7 +220,8 @@
 #  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