glapi: minor ugliness to be able to copy to xorg

diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 469523d57cffd5ca08a72a5778a983685db6933e..631ffba3c7fdb399cb3d084b68ef5f0827af7069 100644 (file)
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -51,22 +51,11 @@
 
 
 #ifdef HAVE_DIX_CONFIG_H
-
 #include <dix-config.h>
-#define PUBLIC
-
+#include "glapi/mesa.h"
 #else
-
 #include "main/glheader.h"
-
-#endif
-
 #include "main/compiler.h"
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef DEBUG
-#include <assert.h>
 #endif
 
 #include "glapi/glapi.h"

diff --git a/src/mesa/glapi/glapi_dispatch.c b/src/mesa/glapi/glapi_dispatch.c
index 4cb43f45055fbaf00794dd15a9fe76f62b017194..32b9535e3fcf0c037efbed052513220a657670b8 100644 (file)
--- a/src/mesa/glapi/glapi_dispatch.c
+++ b/src/mesa/glapi/glapi_dispatch.c
@@ -37,8 +37,14 @@
  * \author Brian Paul <brian@precisioninsight.com>
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#include "glapi/mesa.h"
+#else
 #include "main/glheader.h"
 #include "main/compiler.h"
+#endif
+
 #include "glapi/glapi.h"
 #include "glapi/glapitable.h"
 #include "glapi/glapidispatch.h"

diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index eecfb9c1ae1a87c838eb7b0578a03b087bb42594..69eb42c79ed126d0ee11f734c22da703900f231d 100644 (file)
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -30,10 +30,14 @@
  */
 
 
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#include "glapi/mesa.h"
+#else
 #include "main/glheader.h"
 #include "main/compiler.h"
+#endif
+
 #include "glapi/glapi.h"
 #include "glapi/glapioffsets.h"
 #include "glapi/glapitable.h"

diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c
index aa84b9a169e1ad75a0f2a8c9ea331c1f9ee6144a..b1a718a5f0a5dfa89273092e6920d6a1736fd1b7 100644 (file)
--- a/src/mesa/glapi/glapi_nop.c
+++ b/src/mesa/glapi/glapi_nop.c
@@ -38,8 +38,14 @@
 
 
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#include "glapi/mesa.h"
+#else
 #include "main/compiler.h"
 #include "main/glheader.h"
+#endif
+
 #include "glapi/glapi.h"
 
 #ifdef DEBUG

diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 1c2c38657164ada1056f745e433416a4cca54586..be4e2f754d7d17fd16643c61bdc2e57e5f54dd2f 100644 (file)
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -30,9 +30,11 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#include "glapi/mesa.h"
+#else
+#include "main/compiler.h"
 #endif
 
-#include "main/compiler.h"
 #include "glapi/glthread.h"