From ec3232e36ed3b1f44e909e2edac942c4e8f4b03e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 10 Nov 2025 15:58:09 +0100 Subject: [PATCH] dix: move ReplyNotSwappd() out of public header Internal, non-publich function - should not be in public header. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dix_priv.h | 2 ++ dix/swaprep.c | 5 ++++- dix/tables.c | 1 + include/dixstruct.h | 5 ----- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dix/dix_priv.h b/dix/dix_priv.h index a1e1f37af..19deb74c4 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -761,4 +761,6 @@ static inline int xmitClientEvent(ClientPtr pClient, xEvent ev) int dixAllocColor(ClientPtr client, Colormap cmap, CARD16 *red, CARD16 *green, CARD16 *blue, CARD32 *pixel); +void ReplyNotSwappd(ClientPtr pClient, int size, void *pbuf) _X_NORETURN; + #endif /* _XSERVER_DIX_PRIV_H */ diff --git a/dix/swaprep.c b/dix/swaprep.c index e8765a5a6..78b9074d8 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -48,9 +48,12 @@ SOFTWARE. #include #include +#include + +#include "dix/dix_priv.h" + #include "misc.h" #include "dixstruct.h" -#include #include "scrnintstr.h" #include "swaprep.h" #include "globals.h" diff --git a/dix/tables.c b/dix/tables.c index b3cc94a6e..fcf948f0b 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -49,6 +49,7 @@ SOFTWARE. #include #include +#include "dix/dix_priv.h" #include "dix/reqhandlers_priv.h" #include "windowstr.h" diff --git a/include/dixstruct.h b/include/dixstruct.h index e98ff83fc..11f69e9ef 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -53,11 +53,6 @@ typedef void (*ReplySwapPtr) (ClientPtr /* pClient */ , int /* size */ , void * /* pbuf */ ); -extern _X_EXPORT void -ReplyNotSwappd(ClientPtr /* pClient */ , - int /* size */ , - void * /* pbuf */ ) _X_NORETURN; - typedef enum { ClientStateInitial, ClientStateRunning, ClientStateRetained,