From: Mark Adler <madler@alumni.caltech.edu>
Date: Sat, 19 Nov 2011 07:14:14 +0000 (-0800)
Subject: Facilitate compilation with Borland C++ for pragmas and vsnprintf.
X-Git-Tag: v1.2.5.2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15b5671b78aa67a083565b6aaa41d35086ef5385;p=thirdparty%2Fzlib-ng.git

Facilitate compilation with Borland C++ for pragmas and vsnprintf.
---

diff --git a/gzguts.h b/gzguts.h
index 4d71db06e..88e2bc279 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -43,6 +43,12 @@
 #  endif
 #endif
 
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
 #ifndef HAVE_VSNPRINTF
 #  ifdef MSDOS
 /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
diff --git a/zutil.h b/zutil.h
index 634ce34e6..3b8e5319b 100644
--- a/zutil.h
+++ b/zutil.h
@@ -161,7 +161,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008
   #pragma warn -8066