Merge pull request #75769 from lyuma/msvc_node_debug_fix

Fix libwebp Node struct shadowing Godot's Node class in MSVC debugger
This commit is contained in:
Rémi Verschelde 2023-05-19 10:10:13 +02:00
commit b4584c08f9
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 23 additions and 0 deletions

View file

@ -364,6 +364,8 @@ Files extracted from upstream source:
- `src/` and `sharpyuv/` except from: `.am`, `.rc` and `.in` files
- `AUTHORS`, `COPYING`, `PATENTS`
Patch `godot-node-debug-fix.patch` workarounds shadowing of godot's Node class in the MSVC debugger.
## mbedtls

View file

@ -0,0 +1,16 @@
diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c
index 6d8202d277..8f9a3c8668 100644
--- a/src/enc/quant_enc.c
+++ b/src/enc/quant_enc.c
@@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst,
//------------------------------------------------------------------------------
// Performs trellis-optimized quantization.
+// -- GODOT start --
+// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class.
+#define Node Node_libwebp_quant
+// -- GODOT end --
+
// Trellis node
typedef struct {
int8_t prev; // best previous node

View file

@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst,
//------------------------------------------------------------------------------
// Performs trellis-optimized quantization.
// -- GODOT start --
// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class.
#define Node Node_libwebp_quant
// -- GODOT end --
// Trellis node
typedef struct {
int8_t prev; // best previous node