From 9b6aa824d3140b50a331b5b41ef13a4725db4129 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sun, 5 May 2024 08:23:22 +0200 Subject: [PATCH 1/2] build: Suppress macro undefining warnings --- bin/nxdk-cc | 3 ++- bin/nxdk-cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/nxdk-cc b/bin/nxdk-cc index 1ea029a28..5d18ebff7 100755 --- a/bin/nxdk-cc +++ b/bin/nxdk-cc @@ -2,7 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2021-2022 Stefan Schmidt +# SPDX-FileCopyrightText: 2021-2024 Stefan Schmidt clang \ -target i386-pc-win32 \ @@ -17,6 +17,7 @@ clang \ -I${NXDK_DIR}/lib/pdclib/platform/xbox/include \ -I${NXDK_DIR}/lib/winapi \ -I${NXDK_DIR}/lib/xboxrt/vcruntime \ + -Wno-builtin-macro-redefined \ -DNXDK \ -D__STDC__=1 \ -U__STDC_NO_THREADS__ \ diff --git a/bin/nxdk-cxx b/bin/nxdk-cxx index 68b4d846f..1724f62f8 100755 --- a/bin/nxdk-cxx +++ b/bin/nxdk-cxx @@ -2,7 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2021-2022 Stefan Schmidt +# SPDX-FileCopyrightText: 2021-2024 Stefan Schmidt clang \ -target i386-pc-win32 \ @@ -18,6 +18,7 @@ clang \ -I${NXDK_DIR}/lib/pdclib/platform/xbox/include \ -I${NXDK_DIR}/lib/winapi \ -I${NXDK_DIR}/lib/xboxrt/vcruntime \ + -Wno-builtin-macro-redefined \ -DNXDK \ -D__STDC__=1 \ -U__STDC_NO_THREADS__ \ From 793d81188ec0e16758bb2cfbfc61bab9d7cfc4a8 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sun, 5 May 2024 08:30:00 +0200 Subject: [PATCH 2/2] winapi: Suppress language extension warning on LONG64 typedef --- lib/winapi/winnt.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/winapi/winnt.h b/lib/winapi/winnt.h index d3685dda5..ff1eceb0f 100644 --- a/lib/winapi/winnt.h +++ b/lib/winapi/winnt.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // SPDX-FileCopyrightText: 2019 Jannik Vogel -// SPDX-FileCopyrightText: 2019-2022 Stefan Schmidt +// SPDX-FileCopyrightText: 2019-2024 Stefan Schmidt // SPDX-FileCopyrightText: 2021 Lucas Jansson #ifndef __WINNT_H__ @@ -13,7 +13,10 @@ typedef LONG HRESULT; typedef CHAR *LPSTR; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wlanguage-extension-token" typedef signed __int64 LONG64, *PLONG64; +#pragma clang diagnostic pop LONG64 InterlockedExchange64 (LONG64 volatile *Target, LONG64 Value); PVOID InterlockedExchangePointer (PVOID volatile *Target, PVOID Value);