1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index b331372d16c..e46d2b170f1 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -29,10 +29,16 @@
 #include "main/compiler.h"
 #include "program/hash_table.h"
 
+#ifdef __cplusplus
 extern "C" {
+#endif
+
 #include "brw_context.h"
 #include "brw_eu.h"
-};
+
+#ifdef __cplusplus
+}; /* extern "C" */
+#endif
 
 #include "glsl/ir.h"
 
@@ -40,6 +46,7 @@ struct brw_vec4_compile;
 struct brw_vs_compile;
 struct brw_vec4_prog_key;
 
+#ifdef __cplusplus
 namespace brw {
 
 class dst_reg;
@@ -617,5 +624,6 @@ private:
 };
 
 } /* namespace brw */
+#endif /* __cplusplus */
 
 #endif /* BRW_VEC4_H */