From dd63a5ef994efd7a781ebd3a968fcd9cee4cc826 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 18:56:19 +0200 Subject: [PATCH] (submit/miext-extinit) Xext: shape: unexport noShapeExtension field 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/shape.c | 2 ++ include/extinit.h | 2 -- include/extinit_priv.h | 1 + os/utils.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xext/shape.c b/Xext/shape.c index e3a616148..88911061b 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -72,6 +72,8 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ , #include "panoramiXsrv.h" #endif +Bool noShapeExtension = FALSE; + static int ShapeEventBase = 0; static RESTYPE ClientType, ShapeEventType; /* resource types for event masks */ diff --git a/include/extinit.h b/include/extinit.h index b234dc95e..1d478f0a1 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -66,8 +66,6 @@ extern _X_EXPORT Bool noPanoramiXExtension; extern _X_EXPORT Bool noScreenSaverExtension; #endif -extern _X_EXPORT Bool noShapeExtension; - #ifdef MITSHM extern _X_EXPORT Bool noMITShmExtension; #endif diff --git a/include/extinit_priv.h b/include/extinit_priv.h index 6d1928122..9c28bf5c2 100644 --- a/include/extinit_priv.h +++ b/include/extinit_priv.h @@ -16,6 +16,7 @@ extern Bool noGlxExtension; extern Bool noRenderExtension; extern Bool noResExtension; extern Bool noRRExtension; +extern Bool noShapeExtension; extern Bool noTestExtensions; void CompositeExtensionInit(void); diff --git a/os/utils.c b/os/utils.c index afc638fe1..453cc1159 100644 --- a/os/utils.c +++ b/os/utils.c @@ -130,7 +130,6 @@ Bool noScreenSaverExtension = FALSE; #ifdef MITSHM Bool noMITShmExtension = FALSE; #endif -Bool noShapeExtension = FALSE; #ifdef XCSECURITY Bool noSecurityExtension = FALSE;