diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-11-18 23:14:14 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-11-19 13:53:26 -0800 |
commit | 15b5671b78aa67a083565b6aaa41d35086ef5385 (patch) | |
tree | 0838d6de497f2c203680fe545bf633e01b95495f | |
parent | 6715208bdb5087ae33a54f7e8150e020aebbf15d (diff) | |
download | zlib-15b5671b78aa67a083565b6aaa41d35086ef5385.tar.gz zlib-15b5671b78aa67a083565b6aaa41d35086ef5385.tar.bz2 zlib-15b5671b78aa67a083565b6aaa41d35086ef5385.zip |
Facilitate compilation with Borland C++ for pragmas and vsnprintf.
-rw-r--r-- | gzguts.h | 6 | ||||
-rw-r--r-- | zutil.h | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -43,6 +43,12 @@ | |||
43 | # endif | 43 | # endif |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410) | ||
47 | # ifndef HAVE_VSNPRINTF | ||
48 | # define HAVE_VSNPRINTF | ||
49 | # endif | ||
50 | #endif | ||
51 | |||
46 | #ifndef HAVE_VSNPRINTF | 52 | #ifndef HAVE_VSNPRINTF |
47 | # ifdef MSDOS | 53 | # ifdef MSDOS |
48 | /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), | 54 | /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), |
@@ -161,7 +161,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ | |||
161 | # endif | 161 | # endif |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | #if defined(__BORLANDC__) | 164 | #if defined(__BORLANDC__) && !defined(MSDOS) |
165 | #pragma warn -8004 | 165 | #pragma warn -8004 |
166 | #pragma warn -8008 | 166 | #pragma warn -8008 |
167 | #pragma warn -8066 | 167 | #pragma warn -8066 |