From 82dfd4b71f932f46e116743b204d0077a0875ab8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 11 Aug 2005 14:18:53 +0000
Subject: [PATCH] fix X #includes so they're relative to X11/ directory (bug
 4047)

---
 src/glx/x11/XF86dri.c       | 2 +-
 src/glx/x11/dri_glx.c       | 2 +-
 src/glx/x11/glx_pbuffer.c   | 4 ++--
 src/glx/x11/glxcmds.c       | 6 +++---
 src/glx/x11/glxext.c        | 4 ++--
 src/glx/x11/glxextensions.c | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index d0b7f725547..03fa4e57bce 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 #include "glheader.h"
 #include "xf86dristr.h"
 
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 6ebf21d4028..516ca508c5d 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"
diff --git a/src/glx/x11/glx_pbuffer.c b/src/glx/x11/glx_pbuffer.c
index 9e91fd519f4..83c550559c0 100644
--- a/src/glx/x11/glx_pbuffer.c
+++ b/src/glx/x11/glx_pbuffer.c
@@ -31,8 +31,8 @@
 
 #include <inttypes.h>
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
 #include "glapi.h"
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 093deab3b9b..6a31f24dd8c 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -41,14 +41,14 @@
 
 #include <inttypes.h>
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
 #include "glapi.h"
 #ifdef GLX_DIRECT_RENDERING
 #include "indirect_init.h"
-#include "xf86vmode.h"
+#include <X11/extensions/xf86vmode.h>
 #include "xf86dri.h"
 #endif
 #include "glxextensions.h"
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 1fd2099a7f9..eb6e870e984 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -46,8 +46,8 @@
 
 #include "glxclient.h"
 #include <stdio.h>
-#include <Xext.h>
-#include <extutil.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
 #include <assert.h>
 #include "indirect_init.h"
 #include "glapi.h"
diff --git a/src/glx/x11/glxextensions.c b/src/glx/x11/glxextensions.c
index 7c5d9719a63..d2597981cf3 100644
--- a/src/glx/x11/glxextensions.c
+++ b/src/glx/x11/glxextensions.c
@@ -29,8 +29,8 @@
  */
 
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <string.h>
 #include "glapi.h"
 #include "glxextensions.h"
-- 
2.30.2