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