From f1ee757daaf8ea1000c6558abd1ffc8ad5234c09 Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Thu, 19 Nov 2020 23:39:12 +0000 Subject: Resurrect and modernize C++Builder config Similar configuration to what was deleted in 8e56a422, updated for the unified build scheme. Use the [Clang-based `bcc32c.exe`][1] to avoid a [bug][2] with the old one, and increase the `tlib.exe` page size to 256. Also avoid MSVC-specific C runtime library functions. [1]: http://docwiki.embarcadero.com/RADStudio/Sydney/en/Win32_Clang-enhanced_Compilers [2]: https://quality.embarcadero.com/browse/RSP-31630 Reviewed-by: Richard Levitte Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/13540) --- crypto/conf/conf_sap.c | 2 +- crypto/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto') diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 4188f9113a..5cd018c167 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -15,7 +15,7 @@ #include #include -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__BORLANDC__) # define strdup _strdup #endif diff --git a/crypto/init.c b/crypto/init.c index bf5c17da6d..788abe52e8 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -89,7 +89,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_register_atexit) fprintf(stderr, "OPENSSL_INIT: ossl_init_register_atexit()\n"); #endif #ifndef OPENSSL_SYS_UEFI -# ifdef _WIN32 +# if defined(_WIN32) && !defined(__BORLANDC__) /* We use _onexit() in preference because it gets called on DLL unload */ if (_onexit(win32atexit) == NULL) return 0; -- cgit v1.2.3