sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for libgcrypt 1.6.0 compile error #247 (supported only on Linux because libgcrypt does not yet support native Windows threads).

Browse Source
This commit is contained in:
lotodore
2013-12-19 12:28:35 +01:00
parent 30d5b2b578
commit aa22d39d77
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/socket_startup.cpp
+11 -2
View File
@@ -37,6 +37,10 @@
#ifndef HAVE_OPENSSL #ifndef HAVE_OPENSSL
// With libgcrypt 1.6.0, it is no longer supported to provide thread callbacks.
// Use the default thread implementation instead, and cross fingers that it works with boost thread...
#if GCRYPT_VERSION_NUMBER < 0x010600
extern "C" { extern "C" {
int gcry_bthread_init() int gcry_bthread_init()
@@ -64,12 +68,15 @@ extern "C" {
return 0; return 0;
} }
struct gcry_thread_cbs gcry_threads_boost = { static struct gcry_thread_cbs gcry_threads_boost = {
GCRY_THREAD_OPTION_USER, gcry_bthread_init, gcry_bmutex_init, GCRY_THREAD_OPTION_USER, gcry_bthread_init, gcry_bmutex_init,
gcry_bmutex_destroy, gcry_bmutex_lock, gcry_bmutex_unlock, gcry_bmutex_destroy, gcry_bmutex_lock, gcry_bmutex_unlock,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
}; };
} }
#endif // GCRYPT_VERSION_NUMBER < 0x010600
#endif // not HAVE_OPENSSL #endif // not HAVE_OPENSSL
bool bool
@@ -78,8 +85,10 @@ socket_startup()
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
return SSL_library_init() == 1; return SSL_library_init() == 1;
#else #else
gcry_check_version(NULL); #if GCRYPT_VERSION_NUMBER < 0x010600
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost); gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost);
#endif
gcry_check_version(NULL);
gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
return true; return true;