diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-11-20 00:39:12 +0100 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | f1ee757daaf8ea1000c6558abd1ffc8ad5234c09 (patch) | |
| tree | c42fa4d3b969eae561eff6ce12a39439a759730e /crypto | |
| parent | Avoid redirection to quoted filename (diff) | |
| download | openssl-f1ee757daaf8ea1000c6558abd1ffc8ad5234c09.tar.xz openssl-f1ee757daaf8ea1000c6558abd1ffc8ad5234c09.zip | |
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 <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/conf/conf_sap.c | 2 | ||||
| -rw-r--r-- | crypto/init.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 <openssl/asn1.h> #include <openssl/engine.h> -#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; |