From b85d76b7d6ac81543bffe1db0241e5c4623fa0ae Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 19:24:45 +0200 Subject: [PATCH] (submit/miext-extinit) Xext: shm: unexport noMITShmExtension This field isn't used by any drivers, and also better belongs into the corresponding extension instead of OS adaption layer. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/shm.c | 2 ++ include/extinit.h | 4 ---- include/extinit_priv.h | 1 + os/utils.c | 4 ---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Xext/shm.c b/Xext/shm.c index 1e236cc51..522b149d0 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -110,6 +110,8 @@ static void SShmCompletionEvent(xShmCompletionEvent *from, static Bool ShmDestroyPixmap(PixmapPtr pPixmap); +Bool noMITShmExtension = FALSE; + static unsigned char ShmReqCode; int ShmCompletionCode; int BadShmSegCode; diff --git a/include/extinit.h b/include/extinit.h index 9921bdb3b..3622b0418 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension; extern _X_EXPORT Bool noPanoramiXExtension; #endif -#ifdef MITSHM -extern _X_EXPORT Bool noMITShmExtension; -#endif - #ifdef XCSECURITY extern _X_EXPORT Bool noSecurityExtension; #endif diff --git a/include/extinit_priv.h b/include/extinit_priv.h index 5e781dcb2..db9cdf52b 100644 --- a/include/extinit_priv.h +++ b/include/extinit_priv.h @@ -13,6 +13,7 @@ extern Bool noDbeExtension; extern Bool noDPMSExtension; extern Bool noGEExtension; extern Bool noGlxExtension; +extern Bool noMITShmExtension; extern Bool noRenderExtension; extern Bool noResExtension; extern Bool noRRExtension; diff --git a/os/utils.c b/os/utils.c index 196f9056f..7ee071084 100644 --- a/os/utils.c +++ b/os/utils.c @@ -123,10 +123,6 @@ __stdcall unsigned long GetTickCount(void); #ifdef COMPOSITE Bool noCompositeExtension = FALSE; #endif -#ifdef MITSHM -Bool noMITShmExtension = FALSE; -#endif - #ifdef XCSECURITY Bool noSecurityExtension = FALSE; #endif