diff options
Diffstat (limited to 'src/3rdparty/zlib/zutil.h')
| -rw-r--r-- | src/3rdparty/zlib/zutil.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 7b42edcaa..50bcbbf6e 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -76,17 +76,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) # define OS_CODE 0x00 -# if defined(__TURBOC__) || defined(__BORLANDC__) -# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) - /* Allow compilation with ANSI keywords only enabled */ - void _Cdecl farfree( void *block ); - void *_Cdecl farmalloc( unsigned long nbytes ); -# else -# include <alloc.h> -# endif -# else /* MSC or DJGPP */ -# include <malloc.h> -# endif +# include <malloc.h> #endif #ifdef AMIGA @@ -160,7 +150,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* functions */ -#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) +#if defined(STDC99) # ifndef HAVE_VSNPRINTF # define HAVE_VSNPRINTF # endif @@ -176,9 +166,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ but for now we just assume it doesn't. */ # define NO_vsnprintf # endif -# ifdef __TURBOC__ -# define NO_vsnprintf -# endif # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) |