From d062e59ca269adc4623ae6f4fa856f7821b87c4d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 29 Sep 2022 20:04:19 +0200 Subject: [PATCH] Fix x11_window field type in set_parent struct This needs to have the same size on all platforms, I didn't realize that `clap_xwnd` used longs. --- src/common/serialization/clap/ext/gui.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/serialization/clap/ext/gui.h b/src/common/serialization/clap/ext/gui.h index 658d6427..ff267488 100644 --- a/src/common/serialization/clap/ext/gui.h +++ b/src/common/serialization/clap/ext/gui.h @@ -272,7 +272,9 @@ struct SetParent { native_size_t instance_id; // We only support X11 right now, so we can simplify this a little - clap_xwnd x11_window; + // NOTE: This should be a `clap_xwnd`, but that's defined as an `unsigned + // long` which is 32-bit on Windows and 64-bit on Linux + uint64_t x11_window; template void serialize(S& s) {