aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glapi.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
committermarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
commitd1d04c7bd3f1465b7bb6690022d086c6bb005b70 (patch)
tree058884f2af1a2994f07d887c88bfdea63cc47703 /xorg-server/glx/glapi.h
parent52b728b4b397d26f8841848ee921950e083991d0 (diff)
downloadvcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.gz
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.bz2
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.zip
Synchronised files
Diffstat (limited to 'xorg-server/glx/glapi.h')
-rw-r--r--xorg-server/glx/glapi.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 39b209fe1..f0955fce4 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -44,6 +44,13 @@
#ifndef _GLAPI_H
#define _GLAPI_H
+#include "glapi/glthread.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef _GLAPI_NO_EXPORTS
# define _GLAPI_EXPORT
#else /* _GLAPI_NO_EXPORTS */
@@ -81,7 +88,6 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
#define _glapi_Dispatch _mglapi_Dispatch
#endif
-
/*
* Number of extension functions which we can dynamically add at runtime.
*/
@@ -178,3 +184,7 @@ extern struct _glapi_table *
_glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
#endif
+
+#ifdef __cplusplus
+}
+#endif