From 065f8d4d756370be7cfd96e97da0637d9217ed0c Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 2 Sep 2025 10:25:42 +0200 Subject: [PATCH] dix: unexport internal QueryFont() function This function is internal to DIX (used for assembling XQueryFont replies and not used by any drivers (not even proprietary NVidia), and really shouldn't ever called by them at all. It's been one the many victims of a really unthoughtful mass export back 17 years ago. That'S a necessary step for refactoring the RPC reply mechanics. Since it's never used by any driver at all, we can easily to this change within the current ABI level. Fixes: d6cbd4511e35a89a0353f11834c6fdb8d4d2189f Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dix_priv.h | 3 +++ include/dixfont.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dix/dix_priv.h b/dix/dix_priv.h index bad87ef63..a1d546fd0 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -272,6 +272,9 @@ int CorePointerProc(DeviceIntPtr dev, int what); int CoreKeyboardProc(DeviceIntPtr dev, int what); +typedef struct _xQueryFontReply *xQueryFontReplyPtr; +void QueryFont(FontPtr pFont, xQueryFontReplyPtr pReply, int nProtoCCIStructs); + extern Bool whiteRoot; extern volatile char isItTimeToYield; diff --git a/include/dixfont.h b/include/dixfont.h index 50f2ca0ae..24a414a0f 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -43,12 +43,6 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ , extern _X_EXPORT int CloseFont(void *pfont, XID fid); -typedef struct _xQueryFontReply *xQueryFontReplyPtr; - -extern _X_EXPORT void QueryFont(FontPtr /*pFont */ , - xQueryFontReplyPtr /*pReply */ , - int /*nProtoCCIStructs */ ); - extern _X_EXPORT int ListFonts(ClientPtr /*client */ , unsigned char * /*pattern */ , unsigned int /*length */ ,