From b5ec55f8624bb459f3e6cc66bfa38cf9e10eb174 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 20 Aug 2024 09:14:25 +0200 Subject: [PATCH] Xnest: drop xnestFont() macro Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/GC.c | 2 +- hw/xnest/XNFont.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 85d6ba179..579d9aef8 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -148,7 +148,7 @@ xnestChangeGC(GCPtr pGC, unsigned long mask) values.ts_y_origin = pGC->patOrg.y; if (mask & GCFont) - values.font = xnestFont(pGC->font); + values.font = xnestFontPriv(pGC->font)->font_struct->fid; if (mask & GCSubwindowMode) values.subwindow_mode = pGC->subWindowMode; diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 4806c61e5..a5721085f 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -26,8 +26,6 @@ extern int xnestFontPrivateIndex; #define xnestFontPriv(pFont) \ ((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex)) -#define xnestFont(pFont) (xnestFontPriv(pFont)->font_struct->fid) - Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont); Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);