Mesa (master): r300g: Fix build, invalid extern "C" around header inclusion.

Ilia Mirkin imirkin at kemper.freedesktop.org
Sat Mar 7 03:20:51 UTC 2015


Module: Mesa
Branch: master
Commit: b28c037d64ac7cee7e2c7d9d33b128d62aa4df8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b28c037d64ac7cee7e2c7d9d33b128d62aa4df8a

Author: Mark Janes <mark.a.janes at intel.com>
Date:   Fri Mar  6 13:36:55 2015 -0800

r300g: Fix build, invalid extern "C" around header inclusion.

A previous patch to fix header inclusion within extern "C" neglected
to fix the occurences of this pattern in r300 files.

When the helper to detect this issue was pushed to master, it broke
the build for the r300 driver.  This patch fixes the r300 build.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89477
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/drivers/r300/r300_public.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gallium/drivers/r300/r300_public.h b/src/gallium/drivers/r300/r300_public.h
index b605920..57a69cb 100644
--- a/src/gallium/drivers/r300/r300_public.h
+++ b/src/gallium/drivers/r300/r300_public.h
@@ -2,8 +2,16 @@
 #ifndef R300_PUBLIC_H
 #define R300_PUBLIC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct radeon_winsys;
 
 struct pipe_screen* r300_screen_create(struct radeon_winsys *rws);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif




More information about the mesa-commit mailing list