From bef80a0db94f561a5e4df86935f737d026956a47 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 29 Jul 2024 13:09:27 +0200 Subject: [PATCH] Xnest: drop special hack for Xlib's GC type Now that the name clash on GC type between Xserver and xlib has been fixed, there's no need to do the special renaming hack anymore. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/Display.c | 2 +- hw/xnest/Display.h | 2 +- hw/xnest/XNGC.h | 4 +--- hw/xnest/Xnest.h | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 297d9b9c8..cc909a1a3 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -52,7 +52,7 @@ Pixel xnestWhitePixel; Drawable xnestDefaultDrawables[MAXDEPTH + 1]; Pixmap xnestIconBitmap; Pixmap xnestScreenSaverPixmap; -XlibGC xnestBitmapGC; +GC xnestBitmapGC; unsigned long xnestEventMask; static int _X_NORETURN diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index c1fbaebe5..6252ff964 100644 --- a/hw/xnest/Display.h +++ b/hw/xnest/Display.h @@ -37,7 +37,7 @@ extern Pixel xnestWhitePixel; extern Drawable xnestDefaultDrawables[MAXDEPTH + 1]; extern Pixmap xnestIconBitmap; extern Pixmap xnestScreenSaverPixmap; -extern XlibGC xnestBitmapGC; +extern GC xnestBitmapGC; extern unsigned long xnestEventMask; void xnestOpenDisplay(int argc, char *argv[]); diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index a695f7a3b..d4f3578ce 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -20,10 +20,8 @@ is" without express or implied warranty. #include "include/gcstruct.h" #include "include/privates.h" -/* This file uses the GC definition form Xlib.h as XlibGC. */ - typedef struct { - XlibGC gc; + GC gc; } xnestPrivGC; extern DevPrivateKeyRec xnestGCPrivateKeyRec; diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index fafb2c876..71606f583 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -67,11 +67,9 @@ typedef XID KeySym64; #define KeySym KeySym64 #endif /*_XSERVER64*/ -#define GC XlibGC #include #include #include -#undef GC #ifdef _XSERVER64_tmp #define _XSERVER64