[Mesa-dev] [PATCH 05/14] i965: Allow brw_scalar.h to be included in C files

[Jordan Justen]

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 src/mesa/drivers/dri/i965/brw_scalar.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_scalar.h b/src/mesa/drivers/dri/i965/brw_scalar.h
index 7d3ebdb..be71101 100644
--- a/src/mesa/drivers/dri/i965/brw_scalar.h
+++ b/src/mesa/drivers/dri/i965/brw_scalar.h
@@ -29,7 +29,9 @@
 
 #include "brw_shader.h"
 
+#ifdef __cplusplus
 extern "C" {
+#endif
 
 #include <sys/types.h>
 
@@ -40,20 +42,29 @@ extern "C" {
 #include "program/prog_print.h"
 #include "program/prog_optimize.h"
 #include "program/register_allocate.h"
+#ifdef __cplusplus
 #include "program/sampler.h"
+#endif
 #include "program/hash_table.h"
 #include "brw_context.h"
 #include "brw_eu.h"
 #include "brw_wm.h"
 #include "brw_shader.h"
 #include "intel_asm_annotation.h"
+
+#ifdef __cplusplus
 }
+
 #include "glsl/glsl_types.h"
 #include "glsl/ir.h"
+#endif
 
 #define MAX_SAMPLER_MESSAGE_SIZE 11
 
 struct bblock_t;
+
+#ifdef __cplusplus
+
 namespace {
    struct acp_entry;
 }
@@ -693,8 +704,10 @@ private:
    void *mem_ctx;
 };
 
+struct brw_reg brw_reg_from_fs_reg(fs_reg *reg);
+
+#endif
+
 bool brw_do_channel_expressions(struct exec_list *instructions);
 bool brw_do_vector_splitting(struct exec_list *instructions);
 bool brw_fs_precompile(struct gl_context *ctx, struct gl_shader_program *prog);
-
-struct brw_reg brw_reg_from_fs_reg(fs_reg *reg);
-- 
2.1.0