From patchwork Thu Aug 24 20:02:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4821 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp653447jao; Thu, 24 Aug 2017 13:03:17 -0700 (PDT) X-Received: by 10.223.128.42 with SMTP id 39mr4263131wrk.247.1503604997038; Thu, 24 Aug 2017 13:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503604996; cv=none; d=google.com; s=arc-20160816; b=Y1zOpTTtR2dyDuKuIh28bItHJvHYW8dK759q+RtZK+jzSenf3caTcoWMqNavKnEfK2 bAyToZxjFF28RB3FpvfE6Zi7hUmeos6VPryJMISd67Zktg8m8THZxSBq9JxLuu3CYsGZ +Jwi2+8qVVteZiS8Q899ieMlm5fkH/Sq0TiLMY+D7ghk6bHvvCRFjGAvaqJm1iKR4I8N o5MX/kzKRDsOAqfNr4rDyFUUpEmYcAOGMzzbfOL0jExb3ExrVgvtU8Cm9TP4OKQ3Kd0U UGgctmKBLkJuhUJIjm/9JTRKFSqjSK747bMSQ7Is5DMBuNoBajxRRjANgWT12OUdAv3G tKMA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=g8hVLDdT/nHSVVOtfj/XdyoWjRj8qxvKu6ZzmL/8RCE=; b=ISiVM+gXshyHas4D/Wlhwv80h0md0hSGTZV6xFfH8R1dGvOIPcPr3XNNFmgik+rkgq GphoXpfTlEbIKV8KSE7B1gsVdT7PrzYdFY7Lfa0M5PWaFQKPLVdchWiVUMGZNTtWqZKX sbrnvdW4Cxe3Wzamh5ZHYlWdP8tBoDHp20DcIRYpUhwgdGvEAQ4gwKI6K4Xk75vC2hCV ZqX6m3T5HXvbAC7BR8Is9BFMECmttTYRO9ohHUn8ZzRHomYqPD80wA5F7EflPwLNCGVE dOIDh1aktjdBzRK7MM77IQ6Uad0nvzhQ/LVuYdG+RL3aLGAoHH+1fPvR2S38PzPFwFzY gCcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WDhH/p7V; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h15si2098862wmi.263.2017.08.24.13.03.16; Thu, 24 Aug 2017 13:03:16 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WDhH/p7V; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F78C68991C; Thu, 24 Aug 2017 23:03:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4869E6883D8 for ; Thu, 24 Aug 2017 23:02:59 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id b189so491693wmd.4 for ; Thu, 24 Aug 2017 13:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=gKtH9NDaM4tst3UV3YtQY6hRvP1qVsw72+LSs4To+nw=; b=WDhH/p7VNIsmnEMTMn9jmP4r/Ln/KUed41N1yMeOOHTUwGoQVL8p/VjGzGukgxGocz 6czOF0k/+xneX1gYUfyH3OEhQhablaRZbhy0PFEzjWMMutn2b4ARiz9LGBZwdJjKFmpb TpR1y1aIlzQxrtF8o2tARXdcne/d9azxlLaz/S0Qx9bq5bVlwiI6km/X7SU3TmXDbcZQ MjwQpZq2UEUFclFRCtGyqlhqh3g/jS86Tp5HcoBAk9f9046XiciABZ3jgYOwbCWzzqvz uf/cUEisRz1i8EDnpvDDOg9JR4aBY2lmyWMo6qy9Pps2u0cot6EU2j+ZIsTMSSfaodwS ed9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=gKtH9NDaM4tst3UV3YtQY6hRvP1qVsw72+LSs4To+nw=; b=HXYK06ggWe5d8UirS+N+uCNnvtTauw/EqYjRgYqUT6G2dr9RGHihXM514/jZUq3HfR so/cowSxw0jbR55XsVTh1rXZQkQA4dTQZKh7l0jzcWxPz+C3ISVFCF3+IIX5IW8ewL8V XqvKbvhXlCVwSwUycM3drfGbnp7YL2IzKWw3mJ/U/Vja14jhyykKWmmys8an6czdzFHp vJPknk4FA4N9S6MWRt1X1R+beg2AcpQVIVXsq6lk0rZRyeCZy/AzUePKM1icWuVMmoCX RDK0SHAIImYvuqgYr+gaE0KMyN9uBZb+ouzxf/XJQ9SRu8et+29GzQCD20eB+cOLaCg1 PhRw== X-Gm-Message-State: AHYfb5if9Orbm1vELQWAXFsKYWrqh7WtxLx0Qm7O+RaYnxOzmbg24PBL t8csQCxjvNEKfPnnGNo= X-Received: by 10.28.1.71 with SMTP id 68mr4372367wmb.49.1503604986950; Thu, 24 Aug 2017 13:03:06 -0700 (PDT) Received: from vimeo-vm.localdomain ([82.129.104.219]) by smtp.gmail.com with ESMTPSA id 63sm5515786wra.30.2017.08.24.13.03.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Aug 2017 13:03:06 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Aug 2017 21:02:33 +0100 Message-Id: <1503604953-62888-1-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] utils: Do not expand a macro with 'defined' in it 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] #if USE_MMAP ^ libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP' #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) ^ Signed-off-by: Derek Buitenhuis --- libswscale/utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index b75510d..dcab707 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1574,7 +1574,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, } } -#define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) +#if HAVE_MMAP && HAVE_MPROTECT && defined(MAP_ANONYMOUS) +#define USE_MMAP 1 +#else +#define USE_MMAP 0 +#endif /* precalculate horizontal scaler filter coefficients */ {