Merge pull request #2839

0b08bf39 fixed common/util.cpp to link against libressl (ston1th)
This commit is contained in:
Riccardo Spagni 2017-11-27 22:43:01 +02:00
commit 51e7645836
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 1 deletions

View File

@ -550,7 +550,7 @@ std::string get_nix_version_display_string()
MCLOG_RED(el::Level::Warning, "global", "Running with glibc " << ver << ", hangs may occur - change glibc version if possible"); MCLOG_RED(el::Level::Warning, "global", "Running with glibc " << ver << ", hangs may occur - change glibc version if possible");
#endif #endif
#if OPENSSL_VERSION_NUMBER < 0x10100000 #if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_TEXT)
SSL_library_init(); SSL_library_init();
#else #else
OPENSSL_init_ssl(0, NULL); OPENSSL_init_ssl(0, NULL);