diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-12-09 00:45:11 +0000 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | 96d4ec6724a9ecc5d193172d0cf1a347f428372a (patch) | |
| tree | 2f11dbca5382c5b7adef81fc9480ebee5c7825f8 /test | |
| parent | 6afb36342d4bc63a774fd96088ededfc00401e1d (diff) | |
| download | openssl-96d4ec6724a9ecc5d193172d0cf1a347f428372a.tar.gz | |
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)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/conf_include_test.c | 4 | ||||
| -rw-r--r-- | test/testutil/driver.c | 2 |
3 files changed, 5 insertions, 3 deletions
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 |