From f763f0ec44ce3b1cb4cfde7c4f2bf5ac785dc44a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 22 Apr 2025 20:22:27 +0200
Subject: [PATCH] glx: fix missing include of dix-config.h

This header needs to be included first, otherwise things can easily get really
messed up. The current code only works by accident, because some other header
already including it early enough - but a subtle change in include order
can easy break it.

Thus, always make sure the header is really included first.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 glx/extension_string.c  | 3 ++-
 glx/indirect_size_get.c | 2 +-
 glx/vndext.c            | 1 +
 glx/vndservermapping.c  | 1 +
 glx/vndservervendor.c   | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/glx/extension_string.c b/glx/extension_string.c
index a5b8c747e..e5ba59028 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -31,7 +31,8 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#include "dix-config.h"
+#include <dix-config.h>
+
 #include "extension_string.h"
 #include "opaque.h"
 
diff --git a/glx/indirect_size_get.c b/glx/indirect_size_get.c
index ab04e1a51..d00f9f1ff 100644
--- a/glx/indirect_size_get.c
+++ b/glx/indirect_size_get.c
@@ -22,7 +22,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+#include <dix-config.h>
 
 #include <X11/Xfuncproto.h>
 #include <GL/gl.h>
diff --git a/glx/vndext.c b/glx/vndext.c
index 106526913..513e317bd 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -26,6 +26,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
+#include <dix-config.h>
 
 #include "vndserver_priv.h"
 
diff --git a/glx/vndservermapping.c b/glx/vndservermapping.c
index 1a76e52a8..b55a5f32e 100644
--- a/glx/vndservermapping.c
+++ b/glx/vndservermapping.c
@@ -26,6 +26,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
+#include <dix-config.h>
 
 #include "vndserver_priv.h"
 
diff --git a/glx/vndservervendor.c b/glx/vndservervendor.c
index bd86c67f7..e2e7d194e 100644
--- a/glx/vndservervendor.c
+++ b/glx/vndservervendor.c
@@ -26,6 +26,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
+#include <dix-config.h>
 
 #include "vndservervendor.h"