From: Tanzinul Islam <tanzinul.islam@gmail.com>
Date: Sun, 25 Apr 2021 18:59:29 +0000 (+0100)
Subject: Avoid #include with inline function on C++Builder
X-Git-Tag: openssl-3.0.0-alpha16~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e4981dd59d301f60bcc85f7c893db1ee4a21906;p=thirdparty%2Fopenssl.git

Avoid #include with inline function on C++Builder

Commit 6b2978406 exposed a bug with C++Builder's Clang-based compilers,
which cause inline function definitions in C translation units to not
be found by the linker. Disable the inclusion of the triggering header.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15025)
---

diff --git a/e_os.h b/e_os.h
index b19c4829de2..8bfc1dcb100 100644
--- a/e_os.h
+++ b/e_os.h
@@ -108,7 +108,14 @@
         */
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
-#    include <wspiapi.h>
+       /*
+        * Clang-based C++Builder 10.3.3 toolchains cannot find C inline
+        * definitions at link-time.  This header defines WspiapiLoad() as an
+        * __inline function.  https://quality.embarcadero.com/browse/RSP-33806
+        */
+#    if !defined(__BORLANDC__) || !defined(__clang__)
+#     include <wspiapi.h>
+#    endif
        /* yes, they have to be #included prior to <windows.h> */
 #   endif
 #   include <windows.h>