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)

diff --git a/apps/cmp.c b/apps/cmp.c
index 50282315d81c10ad24dd1047e975e1eca6eb2fec..644fb545d2010a0f9b54a8e44679087ae0cd62d8 100644 (file)
--- 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 df4edfb837d2392d1c7485cd23782dd47b288d10..7eadf5a4b547ecee85bc3270d23bf55bc15c4d58 100644 (file)
--- 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 c352f7086d7d0b86d4a05520f978cdfbf5e2ed8b..340ce29b0971d9c9a0d9a95e131797facde029d0 100644 (file)
--- 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 b31e5dedd55759f603170fff3923d681e14ef836..8043f0d3be47eee4abc92c38e9c2fec9775e54e4 100644 (file)
--- 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 0cf8d49740317f7e969ca0de7be86b97a78f5f5b..a38c4913d2ea453c60b4ff7681eec29dd1b152f2 100644 (file)
--- 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 0b50e2ae1603a29606b5d50eed2aa09c6d4ddcbe..702f7b2caa715d50e30a80292cdba590aeb4cc53 100644 (file)
--- 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