From 6bf48c4805cbb9754aa5a7bcb5f46df6bda95447 Mon Sep 17 00:00:00 2001 From: Moritz Barsnick Date: Tue, 26 Sep 2017 13:25:54 +0200 Subject: lavf/tls_gnutls: fix warnings from version check The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER, but this wasn't introduced before 2.7.2. Building with older versions of GnuTLS (using icc) warns: src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER" #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER macro. Signed-off-by: Moritz Barsnick --- libavformat/tls_gnutls.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavformat/tls_gnutls.c') diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 7174dfd3fc..5ce6c3d448 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -35,6 +35,10 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" +#ifndef GNUTLS_VERSION_NUMBER +#define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER +#endif + #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 #include #include "libavutil/thread.h" -- cgit v1.2.3