From 95499a95254de7b3f4eaf43122b7d335036b5960 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 20 Nov 2025 15:08:20 +0100
Subject: [PATCH] dix: unexport enableIndirectGLX

Still needs to be _X_EXPORT'ed for internal modules, but
not supposed to be visible to external drivers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dix_priv.h                 | 3 +++
 glamor/glamor_glx_provider.c   | 2 ++
 glx/createcontext.c            | 3 +++
 glx/extension_string.c         | 1 +
 hw/xfree86/common/xf86Config.c | 1 +
 include/opaque.h               | 2 --
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 6ff0ddda7..50d67b834 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -60,6 +60,9 @@ extern HWEventQueuePtr checkForInput[2];
  /* -retro mode */
 extern Bool party_like_its_1989;
 
+/* needed by libglx and libglamor (server modules) */
+extern _X_EXPORT Bool enableIndirectGLX;
+
 /*
  * @brief callback right after one screen's root window has been initialized
  *
diff --git a/glamor/glamor_glx_provider.c b/glamor/glamor_glx_provider.c
index c27141c7c..0545eb351 100644
--- a/glamor/glamor_glx_provider.c
+++ b/glamor/glamor_glx_provider.c
@@ -32,6 +32,8 @@
 
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
+
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11
 #include <epoxy/egl.h>
diff --git a/glx/createcontext.c b/glx/createcontext.c
index 4259ad99d..0654666da 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -23,6 +23,9 @@
 #include <dix-config.h>
 
 #include <GL/glxtokens.h>
+
+#include "dix/dix_priv.h"
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "indirect_dispatch.h"
diff --git a/glx/extension_string.c b/glx/extension_string.c
index 0b3db576d..4170a8f9e 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -33,6 +33,7 @@
 
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
 #include "include/extinit.h"
 
 #include "extension_string.h"
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e98db459b..d5dea0ede 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <grp.h>
 
+#include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screensaver_priv.h"
 #include "include/extinit.h"
diff --git a/include/opaque.h b/include/opaque.h
index 7850792e8..b924cfa19 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -33,8 +33,6 @@ from The Open Group.
 
 #include "globals.h"
 
-// needed by libglx and libglamor (server modules)
-extern _X_EXPORT Bool enableIndirectGLX;
 extern _X_EXPORT Bool bgNoneRoot;
 
 #endif                          /* OPAQUE_H */