Re: [Qemu-devel] [PATCH v2 1/2] crypto: fix building complaint

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1375 bytes --]

On 08/29/2016 11:10 PM, 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:

s/verion/version/

> crypto/tlscredsx509.c:618:5: warning: "GNUTLS_VERSION_NUMBER" is not defined
> 

The C preprocessor is well-defined to treat an unknown macro name as 0.
Which compiler are you using that complains?  Is this something that we
consistently work around, or is it better to figure out how to fix your
compiler to quit complaining?

> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  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

At any rate, this is the correct way to silence the warning (even if
verbose), if we do want it, so:
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]