mirror
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build errors and warnings with LLVM-21

This commit is contained in:
Pāvels Nadtočajevs 2025-12-10 20:04:25 +02:00
parent d743736f84
commit 1682f6d4dd
No known key found for this signature in database
GPG Key ID: 8413210218EF35D2
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/text_server_adv/text_server_adv.h
View File

@ -95,7 +95,7 @@ using namespace godot;
// Thirdparty headers. // Thirdparty headers.
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow") GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
#ifdef __EMSCRIPTEN__ #if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier") GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#endif #endif
@ -113,7 +113,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#include <unicode/utypes.h> #include <unicode/utypes.h>
GODOT_GCC_WARNING_POP GODOT_GCC_WARNING_POP
#ifdef __EMSCRIPTEN__ #if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
GODOT_CLANG_WARNING_POP GODOT_CLANG_WARNING_POP
#endif #endif

1
thirdparty/README.md vendored
View File

@ -132,6 +132,7 @@ Files extracted from upstream source:
Patches: Patches:
- `0001-disable-exceptions.patch` (GH-80796) - `0001-disable-exceptions.patch` (GH-80796)
- `0002-llvm-21-header.patch` (GH-113850)
## cvtt ## cvtt

1
thirdparty/clipper2/include/clipper2/clipper.core.h vendored
View File

@ -13,6 +13,7 @@
#include "clipper2/clipper.version.h" #include "clipper2/clipper.version.h"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include <iterator>
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>

12
thirdparty/clipper2/patches/0002-llvm-21-header.patch vendored Normal file
View File

@ -0,0 +1,12 @@
diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
index 5a698e96f4..a68e87225e 100644
--- a/thirdparty/clipper2/include/clipper2/clipper.core.h
+++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
@@ -13,6 +13,7 @@
#include "clipper2/clipper.version.h"
#include <cstdint>
#include <vector>
+#include <iterator>
#include <string>
#include <iostream>
#include <algorithm>