Re: [libvirt] [PATCH] gcrypt: fix build in case we do not use gnutls and gcrypt

In case when we use any crypt library and gnutls make returns compilation errors.

Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com&gt; --- src/libvirt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 52462e3..77365d1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -269,7 +269,7 @@ virWinsockInit(void) } #endif - +#ifdef WITH_GNUTLS #ifdef WITH_GNUTLS_GCRYPT

static int virTLSMutexInit(void **priv) @@ -332,6 +332,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #endif /* WITH_GNUTLS_GCRYPT */ +#endif /* WITH_GNUTLS */ static bool virGlobalError; @@ -357,6 +358,7 @@ virGlobalInit(void) } #endif +#ifdef WITH_GNUTLS #ifdef WITH_GNUTLS_GCRYPT /* * This sequence of API calls it copied exactly from @@ -371,13 +373,10 @@ virGlobalInit(void) gcry_control(GCRYCTL_DISABLE_SECMEM, NULL, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0); } -#endif - - virLogSetFromEnv(); - -#ifdef WITH_GNUTLS +#endif /* End of WITH_GNUTLS_GCRYPT*/ virNetTLSInit(); -#endif +#endif /* End of WITH_GNUTLS*/ + virLogSetFromEnv(); #if WITH_CURL curl_global_init(CURL_GLOBAL_DEFAULT); -- 1.8.3.1 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list