generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-30 22:31:29 +01:00
Code Issues Projects Releases Wiki Activity

add external openssl guard

Browse Source
This commit is contained in:
Alex Fabijanic 2015-12-13 00:49:40 -06:00
parent 50ae257a52
commit c5960a6745
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Crypto/include/Poco/Crypto/OpenSSLInitializer.h
View File

@ -123,7 +123,7 @@ inline void OpenSSLInitializer::disableSSLInitialization()
// needed for OpenSSL static link
#if defined(_WIN32) && !defined(POCO_DLL) && (POCO_MSVS_VERSION >= 2015)
#if defined(_WIN32) && !defined(POCO_DLL) && (POCO_MSVS_VERSION >= 2015) && !defined(POCO_EXTERNAL_OPENSSL)
extern "C" FILE * __cdecl __iob_func(void);
#endif

2
Crypto/src/OpenSSLInitializer.cpp
View File

@ -186,7 +186,7 @@ void uninitializeCrypto()
} } // namespace Poco::Crypto
// needed for OpenSSL static link
#if defined(_WIN32) && !defined(POCO_DLL) && (POCO_MSVS_VERSION >= 2015)
#if defined(_WIN32) && !defined(POCO_DLL) && (POCO_MSVS_VERSION >= 2015) && !defined(POCO_EXTERNAL_OPENSSL)
FILE * __cdecl __iob_func(void)
{
static FILE poco_iob[] = { stdin, stdout, stderr };