From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id BA360384C002 for ; Thu, 9 Sep 2021 05:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA360384C002 From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: cgen: workaround Windows VOID define Date: Thu, 9 Sep 2021 01:23:06 -0400 Message-Id: <20210909052306.29308-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2021 05:23:12 -0000 The cgen framework provides a "VOID" type for code to use, but this defines ends up conflicting with the standard Windows VOID define. Since they actually define to the same thing ("void"), undef it here to fix the Windows build. We might want to reconsider the need for "VOID" in cgen, but that will take larger discussion & coordination with the cgen project. --- sim/common/cgen-types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sim/common/cgen-types.h b/sim/common/cgen-types.h index cb71b6bdda12..059f31a8b1b6 100644 --- a/sim/common/cgen-types.h +++ b/sim/common/cgen-types.h @@ -57,6 +57,8 @@ typedef enum mode_type { extern const char * const cgen_mode_names[]; #define MODE_NAME(m) (cgen_mode_names[m]) +/* Some system headers define VOID already, so undo it. */ +#undef VOID typedef void VOID; typedef unsigned char BI; typedef signed8 QI; -- 2.33.0