Merge pull request #113761 from m4gr3d/bump_android_version_2026

Annual Android versions bump for 2026
This commit is contained in:
Thaddeus Crews 2026-01-28 17:58:21 -06:00
commit 6539f7fade
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
4 changed files with 10 additions and 10 deletions

View file

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