yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(linux): keep the mpv node builder clear of X11's Bool macro

Browse Source 
The Linux native reliability job stopped compiling mpv_player.cc: the
node-conversion builder exposed a leaf named `Bool`, and X11's Xlib.h —
reached through epoxy/egl.h -> EGL/eglplatform.h — defines `Bool` as a
macro for `int`, so the declaration was rewritten into nonsense.

Renames that leaf to `Boolean` across the shared walk and all three
builders. The name is the only thing that changes; no conversion
behaviour differs.
This commit is contained in:
edde746
2026-07-26 23:05:16 +02:00
parent 100d7729df
commit 35f7a12d7c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/mpv/mpv_player_common.h
+6 -4
View File
@@ -252,11 +252,13 @@ inline bool ClaimNodeString(const char* input, NodeConversionBudget* budget, siz
// `Builder` adapts the walk to a platform value type and keeps that platform's
// UTF-8 sanitizer out of this header. It supplies the types `Value`,
// `ListBuilder` and `MapBuilder`, the leaves `Null`, `Bool`, `Int`, `Double`
// and `String(data, length)`, and the containers `NewList`/`Append`/
// `ListBuilder` and `MapBuilder`, the leaves `Null`, `Boolean`, `Int`,
// `Double` and `String(data, length)`, and the containers `NewList`/`Append`/
// `FinishList` plus `NewMap`/`Insert`/`FinishMap`. A value passed to
// `Append`/`Insert` belongs to the builder from then on, and `AbandonMap`
// releases a partially built map whose key was rejected.
// releases a partially built map whose key was rejected. The boolean leaf is
// deliberately not named `Bool`: X11's `Xlib.h`, reached through `epoxy/egl.h`
// on Linux, defines `Bool` as a macro and would rewrite the declaration.
template <typename Builder>
typename Builder::Value ConvertNode(const mpv_node* node, size_t depth, NodeConversionBudget* budget) {
if (!node || !budget || depth >= kMaxNodeDepth || budget->remaining_entries == 0) {
@@ -271,7 +273,7 @@ typename Builder::Value ConvertNode(const mpv_node* node, size_t depth, NodeConv
return Builder::String(node->u.string, length);
}
case MPV_FORMAT_FLAG:
return Builder::Bool(node->u.flag != 0);
return Builder::Boolean(node->u.flag != 0);
case MPV_FORMAT_INT64:
return Builder::Int(node->u.int64);
case MPV_FORMAT_DOUBLE:
shared/mpv/mpv_player_common_test.cpp
+1 -1
View File
@@ -353,7 +353,7 @@ struct TextNodeBuilder {
using MapBuilder = std::string;
static Value Null() { return "null"; }
static Value Bool(bool value) { return value ? "true" : "false"; }
static Value Boolean(bool value) { return value ? "true" : "false"; }
static Value Int(int64_t value) { return std::to_string(value); }
static Value Double(double value) { return std::to_string(value); }
static Value String(const char* value, size_t length) { return "'" + std::string(value, length) + "'"; }