From 26842103378f09a30b7f9c537b6f7b46f01e90d1 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 2 May 2024 17:09:21 +0200
Subject: [PATCH] (submit/miext-extinit) xtest: unexport noTestExtensions 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 <info@metux.net>
---
 Xext/xtest.c                | 2 ++
 hw/xquartz/X11Application.m | 3 ++-
 include/extinit_priv.h      | 1 +
 include/globals.h           | 1 -
 os/utils.c                  | 2 --
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 1eb9d0529..7d21a2490 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -59,6 +59,8 @@
 #include "inpututils.h"
 #include "extinit_priv.h"
 
+Bool noTestExtensions = FALSE;
+
 /* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each
  * other's memory.
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f6f83936a..02019ba7d 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -35,6 +35,8 @@
 #import "X11Application.h"
 #import "NSUserDefaults+XQuartzDefaults.h"
 
+#include "include/extinit_priv.h"
+
 #include "darwin.h"
 #include "quartz.h"
 #include "darwinEvents.h"
@@ -78,7 +80,6 @@ static dispatch_queue_t eventTranslationQueue;
 #define APPKIT_APPFLAGS_HACK 1
 #endif
 
-extern Bool noTestExtensions;
 extern Bool noRenderExtension;
 
 static TISInputSourceRef last_key_layout;
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index e17535e33..0d5553c46 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 noTestExtensions;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/include/globals.h b/include/globals.h
index 887e788c8..47b5bf1a7 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -25,7 +25,6 @@ extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;
 
 extern _X_EXPORT int GrabInProgress;
-extern _X_EXPORT Bool noTestExtensions;
 extern _X_EXPORT char *SeatId;
 extern _X_EXPORT char *ConnectionInfo;
 extern _X_EXPORT sig_atomic_t inSignalContext;
diff --git a/os/utils.c b/os/utils.c
index f0aed8c55..3737b48fa 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -120,8 +120,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-Bool noTestExtensions;
-
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif