---
doxygen/core_subset.doxy | 1 -
src/glx/singlepix.c | 1 -
src/mapi/glapi/gen/glX_proto_recv.py | 1 -
src/mapi/glapi/gen/glX_proto_send.py | 1 -
src/mapi/glapi/glapi.h | 2 +-
src/mapi/glapi/glthread.h | 14 --------------
src/mesa/drivers/x11/glxapi.c | 2 +-
src/mesa/main/api_loopback.c | 1 -
src/mesa/main/api_loopback.h | 1 -
src/mesa/main/errors.c | 1 -
src/mesa/main/execmem.c | 1 -
src/mesa/main/hash.c | 1 -
12 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100644 src/mapi/glapi/glthread.h
diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index 35faf56..dfa59f4 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 b80b2fc..e1468c6 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 42b85a5..d076409 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 8b80441..a98f63e 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 c764271..dcf91a7 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 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 c03c743..a870e94 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 8a04174..d10ae15 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 0b014ad..2195e01 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 603dfc9..ca73a66 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 54239cc..7267cf8 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 06c1be4..4c92005 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"
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
