yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Link Windows crypto libs only when CPPHTTPLIB_OPENSSL_SUPPORT is set (#1254)

Browse source
This commit is contained in:
mylogin 2022-04-21 05:04:55 +03:00 committed by GitHub
parent 6929d90353
commit 696239d6e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
httplib.h
View file

@ -144,8 +144,6 @@ using ssize_t = int;
#include <io.h> #include <io.h>
#include <winsock2.h> #include <winsock2.h>
#include <wincrypt.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#ifndef WSA_FLAG_NO_HANDLE_INHERIT #ifndef WSA_FLAG_NO_HANDLE_INHERIT
@ -154,8 +152,6 @@ using ssize_t = int;
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "ws2_32.lib")
#pragma comment(lib, "crypt32.lib")
#pragma comment(lib, "cryptui.lib")
#endif #endif
#ifndef strcasecmp #ifndef strcasecmp
@ -220,14 +216,20 @@ using socket_t = int;
#include <thread> #include <thread>
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
// used
#ifdef _WIN32 #ifdef _WIN32
#include <wincrypt.h>
// these are defined in wincrypt.h and it breaks compilation if BoringSSL is used
#undef X509_NAME #undef X509_NAME
#undef X509_CERT_PAIR #undef X509_CERT_PAIR
#undef X509_EXTENSIONS #undef X509_EXTENSIONS
#undef PKCS7_SIGNER_INFO #undef PKCS7_SIGNER_INFO
#ifdef _MSC_VER
#pragma comment(lib, "crypt32.lib")
#pragma comment(lib, "cryptui.lib")
#endif #endif
#endif //_WIN32
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>