diff options
| author | Paul Berry <[email protected]> | 2013-03-20 11:35:34 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-08-23 11:02:25 -0700 |
| commit | ad65825098f2029c3853e0f1dbedd045acc05870 (patch) | |
| tree | 1c35e539f58dea69307e33941daa6ea249defde6 /src/mesa/program | |
| parent | 44e07de3acb34152f68308f38c80c9885d8b2fcf (diff) | |
mesa/program: Make prog_instruction.h and program.h safe to include from C++.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_instruction.h | 8 | ||||
| -rw-r--r-- | src/mesa/program/program.h | 8 |
2 files changed, 16 insertions, 0 deletions
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 */ |