diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-10-28 13:39:23 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-01-08 12:31:53 +0900 |
| commit | b3f74bb12ab86a90a05f7d48325b25c408d0b985 (patch) | |
| tree | 9bfd26f8b7c6a3e7a1f2cce66019d41f51fb9cb8 /src/3rdparty/zlib/zconf.h | |
| parent | 64d2e7533f57a6ffd64827d83f93a994efafd8d0 (diff) | |
| download | tqt-b3f74bb1.tar.gz tqt-b3f74bb1.zip | |
Drop Borland compiler specific code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e1261df646edf24612d7f953dac81182e7461b)
Diffstat (limited to 'src/3rdparty/zlib/zconf.h')
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index 3c21403fc..af321ab6f 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -99,7 +99,7 @@ #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) # define STDC #endif -#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +#if !defined(STDC) && defined(__GNUC__) # define STDC #endif #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) @@ -184,11 +184,7 @@ # if (defined(__SMALL__) || defined(__MEDIUM__)) /* Turbo C small or medium model */ # define SMALL_MEDIUM -# ifdef __BORLANDC__ -# define FAR _far -# else -# define FAR far -# endif +# define FAR far # endif #endif @@ -197,7 +193,7 @@ * This is not mandatory, but it offers a little performance increase. */ # ifdef ZLIB_DLL -# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# if defined(WIN32) # ifdef ZLIB_INTERNAL # define ZEXTERN extern __declspec(dllexport) # else @@ -257,12 +253,7 @@ typedef unsigned char Byte; /* 8 bits */ typedef unsigned int uInt; /* 16 bits or more */ typedef unsigned long uLong; /* 32 bits or more */ -#ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ -# define Bytef Byte FAR -#else - typedef Byte FAR Bytef; -#endif +typedef Byte FAR Bytef; typedef char FAR charf; typedef int FAR intf; typedef uInt FAR uIntf; |