8000 Include Crypto.h in NetSSL.h to avoid missing link lib link error by zosrothko · Pull Request #2170 · pocoproject/poco · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Include Crypto.h in NetSSL.h to avoid missing link lib link error #2170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2018
Merged

Include Crypto.h in NetSSL.h to avoid missing link lib link error #2170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9efd58
Use POCO_LIB_SUFFIX as suffix for libssl & libcrypto
zosrothko Feb 18, 2018
d43178b
Use Crypto.h for automatic link #pragma of openssl link libs
zosrothko Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


#include "Poco/Net/Net.h"

#include "Poco/Crypto/Crypto.h"

//
// The following block is the standard way of creating macros which make exporting
Expand All @@ -38,11 +38,6 @@
#else
#define NetSSL_API __declspec(dllimport)
#endif
#else
#if (POCO_MSVS_VERSION >= 2015) // needed for OpenSSL
#pragma comment(lib, "legacy_stdio_definitions.lib")
#pragma comment(lib, "legacy_stdio_wide_specifiers.lib")
#endif
#endif
#endif

Expand All @@ -57,14 +52,10 @@


//
// Automatically link NetSSL and OpenSSL library.
// Automatically link NetSSL
//
#if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS)
#if !defined(POCO_EXTERNAL_OPENSSL)
#pragma comment(lib, "libcrypto.lib")
#pragma comment(lib, "libssl.lib")
#endif // POCO_EXTERNAL_OPENSSL
#if !defined(NetSSL_EXPORTS)
#pragma comment(lib, "PocoNetSSL" POCO_LIB_SUFFIX)
#endif
Expand Down
0