Bug 401440. Fix _vsnprintf part of zlib VC9 compilation problem. r=wtc, a=dsicore
authoraaronleventhal@moonset.net
Mon, 03 Dec 2007 11:00:28 -0800
changeset 8597 a7abaaeaf5e8249cd099c95ba71935cfc6aeed2c
parent 8596 6d0cba4a6cf5daff0b196ff6795e3275bc0fc872
child 8598 d273bdffcc8a7e0170ea22f3b5e8f6aba331900e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswtc, dsicore
bugs401440
milestone1.9b2pre
Bug 401440. Fix _vsnprintf part of zlib VC9 compilation problem. r=wtc, a=dsicore
modules/zlib/src/zutil.h
--- a/modules/zlib/src/zutil.h
+++ b/modules/zlib/src/zutil.h
@@ -3,17 +3,17 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* WARNING: this file should *not* be used by applications. It is
    part of the implementation of the compression library and is
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 3.10 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */
+/* @(#) $Id: zutil.h,v 3.11 2007/12/03 19:00:28 aaronleventhal%moonset.net Exp $ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
 
 #ifdef STDC
@@ -170,17 +170,18 @@ extern const char * const z_errmsg[10]; 
 #endif
 
 #ifndef F_OPEN
 #  define F_OPEN(name, mode) fopen((name), (mode))
 #endif
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) || \
+   (defined(_MSC_VER) && _MSC_VER >= 1500)
 #  ifndef HAVE_VSNPRINTF
 #    define HAVE_VSNPRINTF
 #  endif
 #endif
 #if defined(__CYGWIN__)
 #  ifndef HAVE_VSNPRINTF
 #    define HAVE_VSNPRINTF
 #  endif