From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 4 Oct 2011 09:53:45 +0000 (-0700)
Subject: glapi: Enclose glapi.h in an extern "C" block when included by C++.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d38839a498b38b745f5bdf6b96fbafa2792670be;p=mesa.git

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>
---

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 */