From 8d6efd45db0073e156d160436aebb1c7c7de3d7a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 23 Jan 2016 23:32:35 +0000 Subject: since libgcrypt 1.6 it is no longer needed to configure the threading callbacks --- src/cryptinit.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cryptinit.hpp b/src/cryptinit.hpp index cd11215..663ba0a 100644 --- a/src/cryptinit.hpp +++ b/src/cryptinit.hpp @@ -51,24 +51,28 @@ #if defined(USE_GCRYPT) #include +#if GCRYPT_VERSION_NUMBER < 0x010600 #if defined(BOOST_HAS_PTHREADS) // boost thread callbacks for libgcrypt GCRY_THREAD_OPTION_PTHREAD_IMPL; #else #error You can not use gcrypt without pthreads - please configure Boost to use pthreads! -#endif +#endif // defined(BOOST_HAS_PTHREADS) +#endif // GCRYPT_VERSION_NUMBER < 0x010600 #define MIN_GCRYPT_VERSION "1.2.0" bool initLibGCrypt() { +#if GCRYPT_VERSION_NUMBER < 0x010600 #if defined(BOOST_HAS_PTHREADS) // make libgcrypt thread safe // this must be called before any other libgcrypt call gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); #else #error You can not use gcrypt without pthreads - please configure Boost to use pthreads! -#endif +#endif // defined(BOOST_HAS_PTHREADS) +#endif // GCRYPT_VERSION_NUMBER < 0x010600 // this must be called right after the GCRYCTL_SET_THREAD_CBS command // no other function must be called till now -- cgit v1.2.3