From aca937ac81b9068463bdf5c5357cf14438f1cfd8 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Sat, 18 Sep 2010 17:59:41 -0700 Subject: [PATCH] Bug 573137: Revert a change to zutil.h in changeset fb3a132de4ec. The availability of vsnprintf in recent versions of MSVC has been addressed in zlib 1.2.3.5 (8 Jan 2010). r=n/a a=blocking2.0:final --- modules/zlib/src/zutil.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/zlib/src/zutil.h b/modules/zlib/src/zutil.h index b59e324aea00..d8bdda21f0c9 100644 --- a/modules/zlib/src/zutil.h +++ b/modules/zlib/src/zutil.h @@ -177,8 +177,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* functions */ -#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) || \ - (defined(_MSC_VER) && _MSC_VER >= 1500) +#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) # ifndef HAVE_VSNPRINTF # define HAVE_VSNPRINTF # endif