From patchwork Wed Jan 5 13:49:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 530157 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp317916imp; Wed, 5 Jan 2022 06:17:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsOcdzWrsEu5eVbbI7srBxZkn02GpzaYmbsoty2hXnBU4TEJeyJLLAezm5h5xE8jvLoCsJ X-Received: by 2002:a25:d996:: with SMTP id q144mr70797194ybg.483.1641392269411; Wed, 05 Jan 2022 06:17:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641392269; cv=none; d=google.com; s=arc-20160816; b=ECvO188d25IFG11N2UvcUmqQljRpWZQd6L8L3FZo5bpLVoYDMlwkHKWkH4lJBC4cz7 qQ7u9d1clkySwcxzLqsdICyCEANHIARKYhgG+WUKSn7+fmmPXxOc84VbW50phKZi8ZPe E0nvTuhdsrOcyWz4Y2bYL1URYwP5YcsSJ1pWlVXKq9a050yxNr/X+4/QVrjC+zhkjUeH 4KBtImid3ytWhA6Nrn9LsQml8m3ZY3MTNFGOUP0pE3AP0WlkpaKLvM8FbpyIr+/jhLWL 811wLVT6YiiB1nR23tl5/0pXgHluMf42iDLiAu7GvyU3bbfxpvULVG+U1/TW1VfEd7gY tpYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=pUnzJLXg28F5U/2Y8hEJUScjBpBLM8tJ3KnBsGV8yUU=; b=sBn1yEEgUMkr+rQzHfEE5gybreA37/L8Yapy4jBR2fGANpuuwXANFzC1MbAAHWBsOL lGil7zA+qt78EdEZCqvGdZd7LRhXQPUPvpowbWWLXN12rtfqbruZgSONB5qSekD484fp jsK4+INBVTou0FgL6WAxreR/x5TGRc4WoXTXbGCTLuk6R0ToUnbekKS1V8w0jqHjkBX4 oHA4qEwZcunSMXa2UaEOaNfi+uYZzBfrDoiAFAz6xqiIVbI6lgGZu3WLPfmzrC4AbaHH dyP56uE9r6NCipKPyePHR6oDSGC45M+O2lAjuxRO9tyt17FxU5hX56lFZfT78eWJw+CT vREA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jfPeaGiY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n82si8909354ybc.520.2022.01.05.06.17.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jan 2022 06:17:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jfPeaGiY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n576q-0002Eg-TU for patch@linaro.org; Wed, 05 Jan 2022 09:17:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n56gN-00089R-TW for qemu-devel@nongnu.org; Wed, 05 Jan 2022 08:50:27 -0500 Received: from [2a00:1450:4864:20::536] (port=44621 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n56gI-0004CR-D7 for qemu-devel@nongnu.org; Wed, 05 Jan 2022 08:50:27 -0500 Received: by mail-ed1-x536.google.com with SMTP id w16so162409980edc.11 for ; Wed, 05 Jan 2022 05:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pUnzJLXg28F5U/2Y8hEJUScjBpBLM8tJ3KnBsGV8yUU=; b=jfPeaGiYcLRL1UN0Resi0kq7dGYfeoSn6UD/Az+YKLyJJdBPFMd3r9THstmJkTCl87 /C0XBp2XAnOWn6GfV1Zdglq6kdhcQIqW/ACOAXezaxvt5XwUgRXiMnzklOKGryiUl3Pw vM2F+YMqp7y4cJKJ8M7IVJRBPjV1isvFLkc+Bg1JZ0cBLolBm/zCe7MSn5iXXXcWMldM 90agf1P82iKuUoJE8AqVAeHNzI0lLXkZVu+zxmZ7VGzfEF98vT774rslHINNvVMFZrVp lRBZkk9qy3yP6QTMUw1MhIJfzre9sGqr4mzCxfjO4o1D3iufWrWiR1ypw47EtHmV5FmN kODg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pUnzJLXg28F5U/2Y8hEJUScjBpBLM8tJ3KnBsGV8yUU=; b=2XWFqABOgxTwnpUws7nxsroOZ3DJJsE/nPju0j7wDPCynlfjXvRGxCmmyyuxcht8Ug n4+CpGtkQD3Q2KxE2GYlnhPOzKoh/vDafrGbhn6LlAquPlN1a94xUAX5FAx02q39neJR HkA+hr055UtLbvLnouotu9VAga/Zlm3WBdTtwLsHVr/LjIpklrfbwj5rqgcQsT6veVx8 GfQu6j5KwlXiD0aa39+deyvs156mg/Vc8dw2Q+zB8hW40pUSIU/sDAOxS2x1mv2EWq5+ KovYsBK5LjKKKVT0VmKSCIfAeW0htAVHEx1iRKx2N6SSN+5PbqiC7yohSM0FYBbvVVjo Xdsw== X-Gm-Message-State: AOAM531IJPxPVtMy3S44jdgB68ILUSkW65yWPm+vRECzrMKxnlUVqUCg wSIdzKC9dEzsykY7hBXqjKjxKw== X-Received: by 2002:a17:907:9721:: with SMTP id jg33mr42144311ejc.259.1641390616258; Wed, 05 Jan 2022 05:50:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i20sm15800432edv.44.2022.01.05.05.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 05:50:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 752BB1FFBC; Wed, 5 Jan 2022 13:50:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/34] ui: avoid warnings about directdb on Alpine / musl libc Date: Wed, 5 Jan 2022 13:49:39 +0000 Message-Id: <20220105135009.1584676-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105135009.1584676-1-alex.bennee@linaro.org> References: <20220105135009.1584676-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé On Alpine, SDL is built with directfb support and this triggers warnings during QEMU build In file included from /usr/include/directfb/direct/thread.h:38, from /usr/include/directfb/direct/debug.h:43, from /usr/include/directfb/direct/interface.h:36, from /usr/include/directfb/directfb.h:49, from /usr/include/SDL2/SDL_syswm.h:80, from /builds/berrange/qemu/include/ui/sdl2.h:8, from ../ui/sdl2-gl.c:31: /usr/include/directfb/direct/os/waitqueue.h:41:25: error: redundant redeclaration of 'direct_waitqueue_init' [-Werror=redundant-decls] 41 | DirectResult DIRECT_API direct_waitqueue_init ( DirectWaitQueue *queue ); | ^~~~~~~~~~~~~~~~~~~~~ Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-5-berrange@redhat.com> --- include/ui/sdl2.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 71bcf7ebda..8fb7e08262 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -5,7 +5,18 @@ #undef WIN32_LEAN_AND_MEAN #include + +/* with Alpine / muslc SDL headers pull in directfb headers + * which in turn trigger warning about redundant decls for + * direct_waitqueue_deinit. + */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wredundant-decls" + #include + +#pragma GCC diagnostic pop + #ifdef CONFIG_SDL_IMAGE # include #endif