summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/x11/fakeglx.c1
-rw-r--r--src/mesa/drivers/x11/xm_api.c1
-rw-r--r--src/mesa/drivers/x11/xm_buffer.c1
-rw-r--r--src/mesa/drivers/x11/xmesa.h (renamed from include/GL/xmesa.h)0
-rw-r--r--src/mesa/drivers/x11/xmesaP.h2
-rw-r--r--src/mesa/drivers/x11/xmesa_x.h (renamed from include/GL/xmesa_x.h)0
-rw-r--r--src/mesa/drivers/x11/xmesa_xf86.h (renamed from include/GL/xmesa_xf86.h)0
7 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 827d39f995..ea3585258d 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -42,7 +42,6 @@
#include "glxheader.h"
#include "glxapi.h"
-#include "GL/xmesa.h"
#include "main/context.h"
#include "main/config.h"
#include "main/macros.h"
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index c9009bad03..18aa8bcc09 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -63,7 +63,6 @@
#endif
#include "glxheader.h"
-#include "GL/xmesa.h"
#include "xmesaP.h"
#include "main/context.h"
#include "main/extensions.h"
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index f104d44d05..7ad67bc34d 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -30,7 +30,6 @@
#include "glxheader.h"
-#include "GL/xmesa.h"
#include "xmesaP.h"
#include "main/imports.h"
#include "main/framebuffer.h"
diff --git a/include/GL/xmesa.h b/src/mesa/drivers/x11/xmesa.h
index 98139af833..98139af833 100644
--- a/include/GL/xmesa.h
+++ b/src/mesa/drivers/x11/xmesa.h
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 98867ac710..6a6c9ef600 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -27,7 +27,7 @@
#define XMESAP_H
-#include "GL/xmesa.h"
+#include "xmesa.h"
#include "main/mtypes.h"
#if defined(FX)
#include "GL/fxmesa.h"
diff --git a/include/GL/xmesa_x.h b/src/mesa/drivers/x11/xmesa_x.h
index 865bab4313..865bab4313 100644
--- a/include/GL/xmesa_x.h
+++ b/src/mesa/drivers/x11/xmesa_x.h
diff --git a/include/GL/xmesa_xf86.h b/src/mesa/drivers/x11/xmesa_xf86.h
index 10f93c3ab6..10f93c3ab6 100644
--- a/include/GL/xmesa_xf86.h
+++ b/src/mesa/drivers/x11/xmesa_xf86.h