From 96d4ec6724a9ecc5d193172d0cf1a347f428372a Mon Sep 17 00:00:00 2001
From: Tanzinul Islam <tanzinul.islam@gmail.com>
Date: Wed, 9 Dec 2020 00:45:11 +0000
Subject: [PATCH] Avoid more MSVC-specific C runtime library functions

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
---
 apps/cmp.c               | 2 +-
 apps/lib/apps.c          | 2 +-
 apps/lib/build.info      | 2 +-
 test/build.info          | 2 +-
 test/conf_include_test.c | 4 +++-
 test/testutil/driver.c   | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/cmp.c b/apps/cmp.c
index 50282315d8..644fb545d2 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -20,7 +20,7 @@
 #include "cmp_mock_srv.h"
 
 /* tweaks needed due to missing unistd.h on Windows */
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__BORLANDC__)
 # define access _access
 #endif
 #ifndef F_OK
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index df4edfb837..7eadf5a4b5 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -50,7 +50,7 @@ static int WIN32_rename(const char *from, const char *to);
 # include <conio.h>
 #endif
 
-#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) || defined(__BORLANDC__)
 # define _kbhit kbhit
 #endif
 
diff --git a/apps/lib/build.info b/apps/lib/build.info
index c352f7086d..340ce29b09 100644
--- a/apps/lib/build.info
+++ b/apps/lib/build.info
@@ -1,5 +1,5 @@
 # Auxiliary program source
-IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
+IF[{- $config{target} =~ /^(?:VC-|mingw|BC-)/ -}]
   # It's called 'init', but doesn't have much 'init' in it...
   $AUXLIBAPPSSRC=win32_init.c
 ENDIF
diff --git a/test/build.info b/test/build.info
index b31e5dedd5..8043f0d3be 100644
--- a/test/build.info
+++ b/test/build.info
@@ -5,7 +5,7 @@
 # be useful here.
 #
 # Auxiliary program source (copied from ../apps/build.info)
-IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
+IF[{- $config{target} =~ /^(?:VC-|mingw|BC-)/ -}]
   # It's called 'init', but doesn't have much 'init' in it...
   $AUXLIBAPPSSRC=../apps/lib/win32_init.c
 ENDIF
diff --git a/test/conf_include_test.c b/test/conf_include_test.c
index 0cf8d49740..a38c4913d2 100644
--- a/test/conf_include_test.c
+++ b/test/conf_include_test.c
@@ -16,7 +16,9 @@
 #ifdef _WIN32
 # include <direct.h>
 # define DIRSEP "/\\"
-# define chdir _chdir
+# ifndef __BORLANDC__
+#  define chdir _chdir
+# endif
 # define DIRSEP_PRESERVE 0
 #elif !defined(OPENSSL_NO_POSIX_IO)
 # include <unistd.h>
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 0b50e2ae16..702f7b2caa 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -19,7 +19,7 @@
 
 #include "platform.h"            /* From libapps */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__BORLANDC__)
 # define strdup _strdup
 #endif