Mesa (master): glapi: Enclose glapi.h in an extern "C" block when included by C++.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Oct 4 22:10:49 UTC 2011
Module: Mesa
Branch: master
Commit: d38839a498b38b745f5bdf6b96fbafa2792670be
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d38839a498b38b745f5bdf6b96fbafa2792670be
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Oct 4 02:53:45 2011 -0700
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 at whitecape.org>
Reviewed-and-tested-by: Paul Berry <stereotype441 at gmail.com>
---
src/mapi/glapi/glapi.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index 35dffd7..b9351d1 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 */
More information about the mesa-commit
mailing list