mesa: remove empty glthread.h file

Reviewed-by: José Fonseca <jfonseca@vmware.com>

diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index 35faf565dc40aea0ab19c3eefbd675a4e86e8a79..dfa59f4dd61282ca88f0c04b81bebe7980154118 100644 (file)
--- a/doxygen/core_subset.doxy
+++ b/doxygen/core_subset.doxy
@@ -73,7 +73,6 @@ FILE_PATTERNS          = \
                        fog.h \
                        get.h \
                        glheader.h \
-                       glthread.h \
                        hash.[ch] \
                        hint.h \
                        histogram.h \

diff --git a/src/glx/singlepix.c b/src/glx/singlepix.c
index b80b2fcbd22f48cf89ff54ffcd1b00f90af353f0..e1468c63c2bc9f31e67041b28e390e6968c0befc 100644 (file)
--- a/src/glx/singlepix.c
+++ b/src/glx/singlepix.c
@@ -31,7 +31,6 @@
 #include "packsingle.h"
 #include "indirect.h"
 #include "glapi.h"
-#include "glthread.h"
 #include <GL/glxproto.h>
 
 void

diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py
index 42b85a525c6c0f07087f4628b78046f2aac4bfac..d076409c2faccd8083bff9131b10f1d3d31ce19b 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/src/mapi/glapi/gen/glX_proto_recv.py
@@ -92,7 +92,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
         print '#include "singlesize.h"'
         print '#include "glapi.h"'
         print '#include "glapitable.h"'
-        print '#include "glthread.h"'
         print '#include "dispatch.h"'
         print ''
         print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'

diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index 8b804418bc5e7f0ec9fa855ff3293ba9ee6d9517..a98f63e99ab8a53d703b3a1a47e0e3b0ecd9f45c 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -167,7 +167,6 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
         print '#include "glxclient.h"'
         print '#include "indirect_size.h"'
         print '#include "glapi.h"'
-        print '#include "glthread.h"'
         print '#include <GL/glxproto.h>'
         print '#include <X11/Xlib-xcb.h>'
         print '#include <xcb/xcb.h>'

diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index c764271b0c4d0587de2e1a0e8c97829f9f41d841..dcf91a7f3f4e680c3410198e978b7849e6b4d1d9 100644 (file)
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -44,7 +44,7 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
-#include "glapi/glthread.h"
+#include "u_thread.h"
 
 
 #ifdef __cplusplus

diff --git a/src/mapi/glapi/glthread.h b/src/mapi/glapi/glthread.h
deleted file mode 100644 (file)
index bed2c02..0000000
--- a/src/mapi/glapi/glthread.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GLTHREAD_H
-#define GLTHREAD_H
-
-#include "u_thread.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GLTHREAD_H */

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index c03c7438369103660d606df654e208c20467c5f0..a870e94ed4a06e9968d81cca74e85d304f176764 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -131,7 +131,7 @@ get_dispatch(Display *dpy)
 }
 
 
-/* Don't use the GET_DISPATCH defined in glthread.h */
+/* Don't use the GET_DISPATCH macro */
 #undef GET_DISPATCH
 
 #define GET_DISPATCH(DPY, TABLE)       \

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 8a04174c73fb3b1f5b98830f9ae1b0dd5b27af49..d10ae15ea2e23bcb30ee4384616a482027f95bd2 100644 (file)
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -34,7 +34,6 @@
 #include "api_loopback.h"
 #include "mtypes.h"
 #include "glapi/glapi.h"
-#include "glapi/glthread.h"
 #include "main/dispatch.h"
 #include "main/context.h"
 

diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 0b014ad5a8de22c70ec2601bd0db31ccffe7c1cb..2195e01e35d6a476852db6f74d0d15821c0f89bf 100644 (file)
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -32,7 +32,6 @@
 #include "main/macros.h" // ?
 #include "main/mtypes.h" // ?
 #include "glapi/glapi.h" // ?
-#include "glapi/glthread.h" // ?
 #include "main/dispatch.h" // ?
 #include "main/context.h" // ?
 

diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 603dfc9efba7b076b5dc44307d0e659f3d36397d..ca73a6686d25f63398e1f3225cb65e98b9abd719 100644 (file)
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -37,7 +37,6 @@
 #include "mtypes.h"
 #include "version.h"
 #include "hash_table.h"
-#include "glapi/glthread.h"
 
 #define MESSAGE_LOG 1
 #define MESSAGE_LOG_ARB 2

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 54239cc0a30056d4b7d7b9df40f31e87c4f8b3ec..7267cf85fb4086e07f1f3a80c07af03e0c1ddc3f 100644 (file)
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -32,7 +32,6 @@
 
 
 #include "imports.h"
-#include "glapi/glthread.h"
 
 
 

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 06c1be4a639cee17a3de6024ca794b7f54a50a09..4c92005e049ae4462f5d2c6231e5c9e4517ea1ca 100644 (file)
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -36,7 +36,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "glapi/glthread.h"
 #include "hash.h"
 #include "hash_table.h"