summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doxygen/core_subset.doxy1
-rw-r--r--src/glx/singlepix.c1
-rw-r--r--src/mapi/glapi/gen/glX_proto_recv.py1
-rw-r--r--src/mapi/glapi/gen/glX_proto_send.py1
-rw-r--r--src/mapi/glapi/glapi.h2
-rw-r--r--src/mapi/glapi/glthread.h14
-rw-r--r--src/mesa/drivers/x11/glxapi.c2
-rw-r--r--src/mesa/main/api_loopback.c1
-rw-r--r--src/mesa/main/api_loopback.h1
-rw-r--r--src/mesa/main/errors.c1
-rw-r--r--src/mesa/main/execmem.c1
-rw-r--r--src/mesa/main/hash.c1
12 files changed, 2 insertions, 25 deletions
diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index 35faf565dc4..dfa59f4dd61 100644
--- 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 b80b2fcbd22..e1468c63c2b 100644
--- 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 42b85a525c6..d076409c2fa 100644
--- 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 8b804418bc5..a98f63e99ab 100644
--- 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 c764271b0c4..dcf91a7f3f4 100644
--- 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
index bed2c02f87f..00000000000
--- 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 c03c7438369..a870e94ed4a 100644
--- 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 8a04174c73f..d10ae15ea2e 100644
--- 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 0b014ad5a8d..2195e01e35d 100644
--- 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 603dfc9efba..ca73a6686d2 100644
--- 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 54239cc0a30..7267cf85fb4 100644
--- 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 06c1be4a639..4c92005e049 100644
--- 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"