summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2014-03-01 10:40:24 -0700
committerBrian Paul <brianp@vmware.com>2014-03-03 13:08:59 -0700
commitdb806cacfd8d91e9da5614e1be6e050bc318ec6a (patch)
treeec81c69ebabb01d41b78521b09692b470b438683 /src/mapi
parent94dc91d7ecdec4aadfbbe307dc598bb163af0c74 (diff)
mesa: remove empty glthread.h file
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mapi')
-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
4 files changed, 1 insertions, 17 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py
index 42b85a525c..d076409c2f 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 8b804418bc..a98f63e99a 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 c764271b0c..dcf91a7f3f 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 bed2c02f87..0000000000
--- 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 */