From 8766d2b54df72b81012606f2693c6cd06aeb804c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 19 May 2025 18:48:48 +0200
Subject: [PATCH] ephyr: workaround for name clash between Xlib and Xserver

A slight change in include order can cause Xlib to be included and defining
"GC" type, which is conflicting with Xserver's own type by same name.

As long as MR !1393 hasn't merged yet, we need to do an ugly workaround
using some preprocessor black magic.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/kdrive/ephyr/hostx.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 33dcccf8f..ff3565a72 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -37,6 +37,14 @@
 #include <sys/time.h>
 #include <sys/mman.h>
 
+// workaround for name clash between Xlib and Xserver:
+// GL might pull in Xlib.h (why ?), which is definining a type "GC", that's
+// conflicting with Xserver's "GC" type.
+#define GC XlibGC
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#undef GC
+
 #include "dix/input_priv.h"
 
 #include "hostx.h"