From: Don <don.j.olmstead@gmail.com>
Date: Tue, 9 Jun 2020 16:57:05 +0000 (-0700)
Subject: Remove Borland C++ compiler references
X-Git-Tag: 1.9.9-b1~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0ac4929f0ac3dad3b7a1731962adfc9db465738;p=thirdparty%2Fzlib-ng.git

Remove Borland C++ compiler references

There are a few guards checking for Borland C++ 5.0 or greater which was released
in 1996. While there is still a descendent of this compiler in Embarcadero C++ Builder
its value for __BORLANDC__ is greater than 0x500 so it is safe to remove these guards.
---

diff --git a/gzlib.c b/gzlib.c
index f449d2e06..244396543 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -6,7 +6,7 @@
 #include "zbuild.h"
 #include "gzguts.h"
 
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(_WIN32)
 #  define LSEEK _lseeki64
 #else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
diff --git a/zconf-ng.h.in b/zconf-ng.h.in
index c6c81f633..032c53c01 100644
--- a/zconf-ng.h.in
+++ b/zconf-ng.h.in
@@ -52,7 +52,7 @@
    /* If building or using zlib as a DLL, define ZLIB_DLL.
     * This is not mandatory, but it offers a little performance increase.
     */
-#  if defined(ZLIB_DLL) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#  if defined(ZLIB_DLL)
 #    ifdef ZLIB_INTERNAL
 #      define ZEXTERN extern __declspec(dllexport)
 #    else
diff --git a/zconf.h.in b/zconf.h.in
index eef5207fa..15ac26af4 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -56,7 +56,7 @@
    /* If building or using zlib as a DLL, define ZLIB_DLL.
     * This is not mandatory, but it offers a little performance increase.
     */
-#  if defined(ZLIB_DLL) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#  if defined(ZLIB_DLL)
 #    ifdef ZLIB_INTERNAL
 #      define ZEXTERN extern __declspec(dllexport)
 #    else