From c0c13f07a0e24c18f21fd9eb660f8ba7e3727b09 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Sun, 29 Dec 2024 18:02:59 +0100 Subject: [PATCH] client: drop wl_resource typedef this conflicts with some custom wl extension headers todo: stop using 'wl_resource' in client code altogether... --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4502788..c03374a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -254,7 +254,7 @@ void parseHeader() { )#", (clientCode ? "#include " : "#include "), - (clientCode ? "struct wl_proxy;\ntypedef wl_proxy wl_resource;" : "struct wl_client;\nstruct wl_resource;")); + (clientCode ? "struct wl_proxy;\n#define wl_resource wl_proxy" : "struct wl_client;\nstruct wl_resource;")); // parse all enums if (!waylandEnums) { @@ -503,7 +503,7 @@ class {} {{ HEADER += "\n};\n\n"; } - HEADER += "\n\n#undef F\n"; + HEADER += "\n\n#undef F\n#undef wl_resource\n"; } void parseSource() {