From patchwork Tue Sep 26 11:25:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 5291 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3709546jaa; Tue, 26 Sep 2017 04:31:27 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAYa7xxmtVteZBdzUrKxEDoKQUs3jMJq2DsbhgzIg3leZnYGOzvDjrIKosJnnpPDga7DWbC X-Received: by 10.28.144.206 with SMTP id s197mr3408229wmd.142.1506425486953; Tue, 26 Sep 2017 04:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506425486; cv=none; d=google.com; s=arc-20160816; b=BvIxbCrJ5JQ0FPM4Yfb1tXODp22ca2iGE/2rcu4Z3j0sp9sLOoSu1PezvFUtP4wFeH avDES0sGdoXIbyxd5UwjPTfRF+Z7Z4D+BDF4LECNBcpCrMzsaTQ24sFwKX8dpKbcMkHw crjN4EErilP/+kvlKEr4ztV9RjnkcJ6L/1yTDVsT6Hr6qu6WCXwvdvsL1fAWJWlERDw6 Ij3qwPul8cp0rr0MtS//WHVmERSf+dYhhER8NoCyQcR6aGEX3l4ah3NZKqwvyYgAbWgX ctmJjqiXKVyv/BNCfsT7Qv5QImX59Ao/AQ6dODt5VLrHLH5MJp+ZsqwxILjjscqqh8eO +KGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=IJMF/0bvQH1vuLETST5zIHPEwbD1aXZFhq/DbRat9LY=; b=1I9RvqtHDk0tHssKeduPTfi5PXu9BJf/+xWmnVAhyucvzGkL29eaHZc58cRpybaezi JunG/nqAXQpVIWy+TplTQR3tsslz3tfbcHnf3Sh0wvXdA/ly58/CR2rQpADOCfL6IuwJ qMPGGXNafKUfPVnq6mcc68++v02anvmZoMy5Q1C404VGgVvkH0uq2GmDyhWpRIAUH583 8zAho48jHqvQA6Rh38r7TxGId9oQMuKQB7obi/OsKjYxQBWwXlLkG52jqGo6wS7H4IYf rQ48SLv5/4wSwdfat7AeveZhBjChu4M6wDO4CfHp54mmWKl77B+8K7+DFjKkXirP3DlN qccg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b43si7501171wrb.254.2017.09.26.04.31.26; Tue, 26 Sep 2017 04:31:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B5146891DD; Tue, 26 Sep 2017 14:31:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB650688395 for ; Tue, 26 Sep 2017 14:31:06 +0300 (EEST) Received: from paradise.fritz.box ([91.19.55.77]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LuKHz-1dFoL93WAJ-011hBn; Tue, 26 Sep 2017 13:26:16 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Tue, 26 Sep 2017 13:25:54 +0200 Message-Id: <202fa89b7957dafd4c25dfb265ff753250a19f6b.1506421345.git.barsnick@gmx.net> X-Mailer: git-send-email 2.9.5 In-Reply-To: References: In-Reply-To: <85a1e278b48d03da99f17c2d0bbc9fc1c52d6c97.1506421345.git.barsnick@gmx.net> References: <85a1e278b48d03da99f17c2d0bbc9fc1c52d6c97.1506421345.git.barsnick@gmx.net> X-Provags-ID: V03:K0:tvt5jLvblp3KAfQxx9uyHnDZHNbf8gER7cOScM2tsAbCV3mjHaL O4i64AiG8YnNc9QywBEyr6XSUnOB++fTTNaqLb0j1YgLcvVXzOGbdtxhjoR0FsF5ld+G19I +RTE0LCo1l9QVVh12ood3wltHN/B0lJ3Gb7I62BqaL08UEUE0+R5zh0flHIkrNEjAfCoBOe dpgRoGBtEvETdYmTuO+Vg== X-UI-Out-Filterresults: notjunk:1; V01:K0:h8GQDZ/CWG0=:H/o/tQF4IWLm+3h7kjUVL/ WaeYkCWV4BGj0Jp9HpoeEKbnw+JRmD4vC3UN6ctebJHsz18pvzsWZLLu19hTnd0cvilAEFdMb sepdpDKqwW0999ynf/Bby7UrYx1gF/S/oGTaVtAm7S9Q1ffPsvyeMSVt1QaSC/60fZAgGkHLO /za/2zYctvVrvLg8FSaz1kHdcQgQzmYbaxMA2A7tWDKKtO/KH4WpfKqkdGfzRwlii86GJ5bNg NtipTnMkCVLre+SEkDnJ2o9SMSUhgiiDSvZFMTWh56BuDrzQL/jwKhO/My8bIqBRGNBHMwYM3 HvGUok2HQnfWwAibK+ygShjNNPvukOt3SUK8OA9XMuRMAniJHt452s1vIXlVOEMAGHQqLWd1/ jT5J3nlBPuhYjcGK3r7rT24yOh22H88J97rlhUIrQ67ebv3xOtFGAC2bHaAOcYQY9OXI2d0VW 232cOrrAmo+HGFFx+yZnxsxf40cKcWt8fZ5/uIFAUP/HdhTm0Ve856jvpdyXN5eBZL7YH1SK4 sCvKU7qVVup8Ze09XWsSJci699QBzpZsbpU6SZ4Gzrucx7RPx1gYvQipZnnQVjrIqYZ8Ff1Pf y0yQesgDzGh7Gs9ZC1tsBO2r272qh0FWLr0uc/2jcwJ2e+dEqsNJsIfpS7QVD8hqZPFP3plLJ wSxSzmzJJ/AvZQixx0m8DGNd2KiPlinxFAPzUcnGQ19174UYrjxprgd6eQ8KptOXjBUJ5rlMd 040hWfjbXjrN7DolJJul2Hn7Vk/cer9yfzMkoWzaRhaKJlRtKSIAx3OUJvWjGI9uooStvsXhu LgvzoJCGQn8VRe0qc/LkGik3XREDQ== Subject: [FFmpeg-devel] [PATCH 2/2] lavf/tls_gnutls: fix warnings from version check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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(+) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 7174dfd..5ce6c3d 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"