From patchwork Wed Jan 12 11:26:55 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: 531565 Delivered-To: patch@linaro.org Received: by 2002:a5d:4010:0:0:0:0:0 with SMTP id n16csp1487354wrp; Wed, 12 Jan 2022 03:36:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZrv6xZjn6Sa351GyJ/Mjxp61hei7ZLMVava1l1dfc/Bn6iVJXet7L6ETHmjX82yqZFzH+ X-Received: by 2002:a05:6902:20d:: with SMTP id j13mr12319533ybs.18.1641987416198; Wed, 12 Jan 2022 03:36:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641987416; cv=none; d=google.com; s=arc-20160816; b=kmlX6rkru6Sd4YavxlatrR+C7lSBHgeuFuAJWXP33LFBDnQ7nTi9CYmJoQ/gEll0h4 HL9FXEBjkWNmcCT6PLpMJW7sBwTLwwaR4c9trIUBPBqMty5bWyc50N6//bp+u4z7Tc9p GdYa/ogu3yHKKnjU7Wgact9hFt1cVQHF7oKrzARXBp8CeliE0j4mbGNd2mMgkDWr4wBw WLMiXu5iib43q3dMs9pLhHr6spI3/POELnMrcyyuQ83HPEv6kC9kCtOG4IVx7sJpRRmE dUjitQ7MLfWLD3o95QYloY0Tlv1NMozW7Z/jnjd/uO940afsyBj1x/R1q4T4ISFHUMsD PRxQ== 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=COu1PeHtLU/9lCIB+cZx16YusyKpa48++X4AOAyvvOI=; b=CtYHHNzn0rOPvbDFgO6MXWdjUqOjxACvkak8lvDJ3T0KT0Pr+L/j8OEOTLxfH+6dbK qs5CFKUwFiaj8/0ItxIbuXow6C6BtEXtyT4JQNc5rrSrFu2deb+asIV06sAkYmV5AxlO PcgT5Ta+8rkDljD5l505gvtCmZpMGey7CYkJUDbWiCrd/URZ+1KYE0YhEUdhNhXKm11W Vp75aUInkJ9a9sVHIRaAcan1QLJTp1cj8gblYHHctbSXW+Zo+W8G04Ebbl0PsaAKiotI 06OelTmF+SXm9DOU7ivWl3lqZJMlKTZ/DZIxTm5PvdOCOg0f1Th7Jxd3nLvY0Wt8AlbO HFkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dyykPUuH; 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 s17si9879106ybg.409.2022.01.12.03.36.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Jan 2022 03:36:56 -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=dyykPUuH; 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]:50050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7bvz-000658-Jf for patch@linaro.org; Wed, 12 Jan 2022 06:36:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7bmw-0002cZ-Ri for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:34 -0500 Received: from [2607:f8b0:4864:20::935] (port=43936 helo=mail-ua1-x935.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7bmu-0003Nx-MW for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:33 -0500 Received: by mail-ua1-x935.google.com with SMTP id i5so4035648uaq.10 for ; Wed, 12 Jan 2022 03:27:32 -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=COu1PeHtLU/9lCIB+cZx16YusyKpa48++X4AOAyvvOI=; b=dyykPUuHxfHwnADwrzp2NzVWdtiiF6/CMu7vfQPx2IKPinSm8qt0s862t+aea5ocwl BEtB41jfA9uPkfRnRiWunAAF6H+B7+imWFDAEcwP6IZf5x9WA1Ncj9edlxAurox6knEH yKqA1XEDzmrRvPQ8VnKQKnGCyTOVprleqLPCbxhpsVwdiz37C9s85LLOrWUPuiJ1vihd /NuWhnrhSzBBGim5R6EZtVdGCSw1xtS7m+54YyH2lnPhZXHEYPZauRq7MOIIcxobPxf3 g4vuZIKEwMC/28upuqpG5T28avhiDTTFNqLrDFVZJwrcJ2hjGKkZ2f3QBTK8i0BBUhnm l5ow== 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=COu1PeHtLU/9lCIB+cZx16YusyKpa48++X4AOAyvvOI=; b=TdCpRwpeY/TeBEotEig6gO5hrQPoL3CldxmL4gReu4R1cn60smkafpGqGp3cCBP6QQ Z9RyEAO9+QZoycrUrAVH/ZLv+FHQ2krsvwLdQb7BSZsBdGSm1VmHxp4hr1SVuYPKISUh yKjuXCLMpOVf1cu50Fp5bZc0xelr6vRUx4+sfzJq8n4q1fdirQOp6mhhiAVjDDcNkYx0 qlkz2RZx3MI8/nPT87qniaUNVS5sLlAy2+EbK6Yh7eQXeKw63PqguXV3S7FNGb+HJbzi fR/med/CVGjSXUz9n8d0FHAP3nHB/XVUKzH+didKFPxx1XkhkPFTGmN9j51+4OtRt8bO FJBw== X-Gm-Message-State: AOAM530pxD+5MHp8NRoMW52BzhZLCrioSg3ExuREQ+8QQBmKre0NMJyN 3FpfcT2gYVmC5ekVN2smyF3jNg== X-Received: by 2002:ab0:2904:: with SMTP id v4mr3737243uap.57.1641986851601; Wed, 12 Jan 2022 03:27:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j187sm7178444vkj.37.2022.01.12.03.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 03:27:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9D8B01FFBC; Wed, 12 Jan 2022 11:27:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/31] ui: avoid warnings about directdb on Alpine / musl libc Date: Wed, 12 Jan 2022 11:26:55 +0000 Message-Id: <20220112112722.3641051-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112112722.3641051-1-alex.bennee@linaro.org> References: <20220112112722.3641051-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::935 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::935; envelope-from=alex.bennee@linaro.org; helo=mail-ua1-x935.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: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E?= =?utf-8?q?_Berrang=C3=A9?= , qemu-devel@nongnu.org, Gerd Hoffmann 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> Message-Id: <20220105135009.1584676-5-alex.bennee@linaro.org> 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