Do not include openssl/applink.c: we do not use _fp() OpenSSL API since
r1909252.
* CMakeLists.txt
* SConstruct
(): Do not test for openssl/applink.c.
* test/test_ssl.c
(): Do not include openssl/applink.c.
git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1909406 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1d176b..6a66091 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,7 +243,6 @@
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES} ${SERF_STANDARD_LIBRARIES})
CheckFunctionMacro("SSL_library_init" "SERF_HAVE_OPENSSL_SSL_LIBRARY_INIT" "openssl/ssl.h"
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES} ${SERF_STANDARD_LIBRARIES})
-CheckHeader("openssl/applink.c" "SERF_HAVE_OPENSSL_APPLINK_C" ${OPENSSL_INCLUDE_DIR})
CheckHeader("stdbool.h" "HAVE_STDBOOL_H=1")
CheckType("OSSL_HANDSHAKE_STATE" "openssl/ssl.h" "SERF_HAVE_OSSL_HANDSHAKE_STATE" ${OPENSSL_INCLUDE_DIR})
diff --git a/SConstruct b/SConstruct
index d94d493..f2cff14 100644
--- a/SConstruct
+++ b/SConstruct
@@ -507,8 +507,6 @@
# Check for OpenSSL functions which are only available in some of
# the versions we support. Also handles forks like LibreSSL.
conf = Configure(env)
-if conf.CheckCHeader('openssl/applink.c'):
- env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_APPLINK_C'])
if not conf.CheckFunc('BIO_set_init', '#include <openssl/crypto.h>'):
env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
if not conf.CheckFunc('X509_STORE_get0_param', '#include <openssl/crypto.h>'):
diff --git a/test/test_ssl.c b/test/test_ssl.c
index 8dc04c9..9e8036c 100644
--- a/test/test_ssl.c
+++ b/test/test_ssl.c
@@ -35,19 +35,6 @@
#include <openssl/ocsp.h>
#endif
-#if defined(WIN32) && defined(_DEBUG) && defined(SERF_HAVE_OPENSSL_APPLINK_C)
-/* Include this file to allow running a Debug build of serf with a Release
- build of OpenSSL. Note: his file is not available on OpenSSL 1.1.x. */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(push)
-#pragma warning(disable: 4152)
-#endif
-#include <openssl/applink.c>
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(pop)
-#endif
-#endif
-
/* Test setting up the openssl library. */
static void test_ssl_init(CuTest *tc)
{
