From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgqvT-0004cO-DV for qemu-devel@nongnu.org; Mon, 05 Sep 2016 06:14:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgqvQ-00081p-7W for qemu-devel@nongnu.org; Mon, 05 Sep 2016 06:14:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgqvQ-00081j-2i for qemu-devel@nongnu.org; Mon, 05 Sep 2016 06:14:48 -0400 Date: Mon, 5 Sep 2016 11:14:43 +0100 From: "Daniel P. Berrange" Message-ID: <20160905101443.GC17398@redhat.com> Reply-To: "Daniel P. Berrange" References: <1472530253-94132-1-git-send-email-arei.gonglei@huawei.com> <1472530253-94132-2-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1472530253-94132-2-git-send-email-arei.gonglei@huawei.com> Subject: Re: [Qemu-devel] [PATCH v2 1/2] crypto: fix building complaint List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gonglei Cc: qemu-devel@nongnu.org, dmitry@daynix.com On Tue, Aug 30, 2016 at 12:10:52PM +0800, Gonglei wrote: > gnutls commit 846753877d renamed LIBGNUTLS_VERSION_NUMBER to GNUTLS_VERSION_NUMBER. > If using gnutls before that verion, we'll get the below warning: > crypto/tlscredsx509.c:618:5: warning: "GNUTLS_VERSION_NUMBER" is not defined > > Signed-off-by: Gonglei > --- > crypto/tlscredsx509.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c > index 520d34d..f2fd80f 100644 > --- a/crypto/tlscredsx509.c > +++ b/crypto/tlscredsx509.c > @@ -615,7 +615,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds, > } > > if (cert != NULL && key != NULL) { > -#if GNUTLS_VERSION_NUMBER >= 0x030111 > +#if defined(GNUTLS_VERSION_NUMBER) && GNUTLS_VERSION_NUMBER >= 0x030111 > char *password = NULL; > if (creds->passwordid) { > password = qcrypto_secret_lookup_as_utf8(creds->passwordid, Other places in this file still use LIBGNUTLS_VERSION_NUMBER, which is good, because gnutls 3.x still defines LIBGNUTLS_VERSION_NUMBER for back compat. The tests/test-crypto-tlscredsx509.c file also needs a similar fix. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|