projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6399b7d
)
glapi: Enclose glapi.h in an extern "C" block when included by C++.
author
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 4 Oct 2011 09:53:45 +0000
(
02:53
-0700)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 4 Oct 2011 22:11:42 +0000
(15:11 -0700)
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>
src/mapi/glapi/glapi.h
patch
|
blob
|
history
diff --git
a/src/mapi/glapi/glapi.h
b/src/mapi/glapi/glapi.h
index 35dffd757672ec7e58852c75b93f74263aa2ebb6..b9351d146d8955508c69a46f3bf46c691099ec64 100644
(file)
--- 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 */