From 38eedc3de57c60424b62a46afcbd7f794b76628a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 20 Oct 2025 10:43:36 +0200 Subject: [PATCH] Xext: shm: move ShmDescRec definition into shm.c Only used inside shm.c, not anywhere else, so no need to keep it in a public header file. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/shm_priv.h | 14 ++++++++++++++ Xext/shmint.h | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Xext/shm_priv.h b/Xext/shm_priv.h index 8866fd627..ef6bf0845 100644 --- a/Xext/shm_priv.h +++ b/Xext/shm_priv.h @@ -9,6 +9,20 @@ #include "include/resource.h" #include "Xext/shmint.h" +typedef struct _ShmDesc { + struct _ShmDesc *next; + int shmid; + int refcnt; + char *addr; + Bool writable; + unsigned long size; +#ifdef SHM_FD_PASSING + Bool is_fd; + struct busfault *busfault; + XID resource; +#endif +} ShmDescRec, *ShmDescPtr; + extern RESTYPE ShmSegType; #endif /* _XSERVER_XEXT_SHM_PRIV_H */ diff --git a/Xext/shmint.h b/Xext/shmint.h index 1d2cac1ad..d7fda390a 100644 --- a/Xext/shmint.h +++ b/Xext/shmint.h @@ -60,20 +60,6 @@ typedef struct _ShmFuncs { #define SHM_FD_PASSING 1 #endif -typedef struct _ShmDesc { - struct _ShmDesc *next; - int shmid; - int refcnt; - char *addr; - Bool writable; - unsigned long size; -#ifdef SHM_FD_PASSING - Bool is_fd; - struct busfault *busfault; - XID resource; -#endif -} ShmDescRec, *ShmDescPtr; - #ifdef SHM_FD_PASSING #define SHMDESC_IS_FD(shmdesc) ((shmdesc)->is_fd) #else