From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 18 Dec 2009 11:02:07 +0000 (+0100)
Subject: Fix compilation with gcrypt < 1.4.2
X-Git-Tag: v0.7.5~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c5c63338c90f6e82731f6871901dc72732033ef;p=thirdparty%2Flibvirt.git

Fix compilation with gcrypt < 1.4.2

Commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee increased the gcrypt
version requirement to 1.4.2 because the GCRY_THREAD_OPTION_VERSION
define was added in this version.

The configure script doesn't check for the gcrypt version. To support
gcrypt versions < 1.4.2 change the virTLSThreadImpl initialization
to use GCRY_THREAD_OPTION_VERSION only if it's defined.
---

diff --git a/src/libvirt.c b/src/libvirt.c
index 5167bc24d8..16c851ff3e 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -291,7 +291,12 @@ static int virTLSMutexUnlock(void **priv)
 }
 
 static struct gcry_thread_cbs virTLSThreadImpl = {
+    /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */
+#ifdef GCRY_THREAD_OPTION_VERSION
     (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
+#else
+    GCRY_THREAD_OPTION_PTHREAD,
+#endif
     NULL,
     virTLSMutexInit,
     virTLSMutexDestroy,