From: Paul Berry <stereotype441@gmail.com>
Date: Wed, 20 Mar 2013 18:35:34 +0000 (-0700)
Subject: mesa/program: Make prog_instruction.h and program.h safe to include from C++.
X-Git-Tag: upstream/10.0.5~1697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad65825098f2029c3853e0f1dbedd045acc05870;p=platform%2Fupstream%2Fmesa.git

mesa/program: Make prog_instruction.h and program.h safe to include from C++.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h
index be221819f15..b9604e50d92 100644
--- a/src/mesa/program/prog_instruction.h
+++ b/src/mesa/program/prog_instruction.h
@@ -386,6 +386,10 @@ struct prog_instruction
 };
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void
 _mesa_init_instructions(struct prog_instruction *inst, GLuint count);
 
@@ -419,4 +423,8 @@ extern const char *
 _mesa_opcode_string(gl_inst_opcode opcode);
 
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif /* PROG_INSTRUCTION_H */
diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
index f2898389460..34965ab991d 100644
--- a/src/mesa/program/program.h
+++ b/src/mesa/program/program.h
@@ -44,6 +44,10 @@
 #include "main/mtypes.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern struct gl_program _mesa_DummyProgram;
 
 
@@ -256,4 +260,8 @@ gl_geometry_program_const(const struct gl_program *prog)
 }
 
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif /* PROGRAM_H */