summaryrefslogtreecommitdiffstats
path: root/src/mapi/glapi/glapi.h
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-10-04 02:53:45 -0700
committerKenneth Graunke <kenneth@whitecape.org>2011-10-04 15:11:42 -0700
commitd38839a498b38b745f5bdf6b96fbafa2792670be (patch)
treedc473de881022e51797f5eaaa30900cc9d456c8f /src/mapi/glapi/glapi.h
parent6399b7d638ec61889820f949ff869822e6186bbf (diff)
glapi: Enclose glapi.h in an extern "C" block when included by C++.
Fixes a build failure introduced in commit b7fa0d0727a3a9e1f64d3cfc7a0f157b35dec09e. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-and-tested-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/mapi/glapi/glapi.h')
-rw-r--r--src/mapi/glapi/glapi.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index 35dffd75767..b9351d146d8 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -44,6 +44,9 @@
#ifndef _GLAPI_H
#define _GLAPI_H
+#ifdef __cplusplus
+extern "C" {
+#endif
#ifdef _GLAPI_NO_EXPORTS
# define _GLAPI_EXPORT
@@ -177,5 +180,8 @@ _glapi_noop_enable_warnings(unsigned char enable);
_GLAPI_EXPORT void
_glapi_set_warning_func(_glapi_proc func);
+#ifdef __cplusplus
+}
+#endif
#endif /* _GLAPI_H */