Skip to content

Commit

Permalink
Merge pull request #3568 from Partmedia/ssl
Browse files Browse the repository at this point in the history
Fix build on FreeBSD
  • Loading branch information
hacst committed Dec 31, 2018
2 parents 5ff6fdc + a78cff3 commit 06af4e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -7,9 +7,10 @@ asio/
local/
indent.sh
*.pdb
*.sln
*.sdf
*.sln
*.suo
*.swp
*.aps
*.vcxproj
*.vcxproj.*
Expand Down
3 changes: 1 addition & 2 deletions src/SSL.cpp
Expand Up @@ -29,8 +29,7 @@ void MumbleSSL::initialize() {
// If we detect that no locking callback is configured, we
// have to set it up ourselves to allow multi-threaded use
// of OpenSSL.
void *lockcb = reinterpret_cast<void *>(CRYPTO_get_locking_callback());
if (lockcb == NULL) {
if (CRYPTO_get_locking_callback() == NULL) {
SSLLocks::initialize();
}
}
Expand Down

0 comments on commit 06af4e3

Please sign in to comment.