Module: Mesa Branch: master Commit: 641314eff3b113c19b1a9f90e21dba82167d85e4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=641314eff3b113c19b1a9f90e21dba82167d85e4
Author: Brian Paul <[email protected]> Date: Mon Dec 15 16:37:35 2014 -0700 mesa: put extern "C" in src/mesa/program/*h header files Reviewed-by: Anuj Phogat <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> --- src/mesa/program/prog_cache.h | 11 +++++++++++ src/mesa/program/prog_optimize.h | 11 +++++++++++ src/mesa/program/prog_print.h | 11 +++++++++++ src/mesa/program/programopt.h | 10 ++++++++++ 4 files changed, 43 insertions(+) diff --git a/src/mesa/program/prog_cache.h b/src/mesa/program/prog_cache.h index fdd7e26..e37f1d7 100644 --- a/src/mesa/program/prog_cache.h +++ b/src/mesa/program/prog_cache.h @@ -32,6 +32,12 @@ #include "main/glheader.h" + +#ifdef __cplusplus +extern "C" { +#endif + + struct gl_context; /** Opaque type */ @@ -65,4 +71,9 @@ _mesa_shader_cache_insert(struct gl_context *ctx, struct gl_shader_program *program); +#ifdef __cplusplus +} +#endif + + #endif /* PROG_CACHE_H */ diff --git a/src/mesa/program/prog_optimize.h b/src/mesa/program/prog_optimize.h index 7607bff..1f20ac0 100644 --- a/src/mesa/program/prog_optimize.h +++ b/src/mesa/program/prog_optimize.h @@ -29,6 +29,11 @@ #include "main/glheader.h" +#ifdef __cplusplus +extern "C" { +#endif + + struct gl_context; struct gl_program; struct prog_instruction; @@ -46,4 +51,10 @@ _mesa_optimize_program(struct gl_context *ctx, struct gl_program *program); extern GLboolean _mesa_constant_fold(struct gl_program *prog); + +#ifdef __cplusplus +} +#endif + + #endif diff --git a/src/mesa/program/prog_print.h b/src/mesa/program/prog_print.h index cd61568..9058dfa 100644 --- a/src/mesa/program/prog_print.h +++ b/src/mesa/program/prog_print.h @@ -31,6 +31,12 @@ #include "main/glheader.h" #include "main/mtypes.h" + +#ifdef __cplusplus +extern "C" { +#endif + + struct gl_program; struct gl_program_parameter_list; struct gl_shader; @@ -115,4 +121,9 @@ extern void _mesa_append_uniforms_to_file(const struct gl_shader *shader); +#ifdef __cplusplus +} +#endif + + #endif /* PROG_PRINT_H */ diff --git a/src/mesa/program/programopt.h b/src/mesa/program/programopt.h index f22109f..93c00f7 100644 --- a/src/mesa/program/programopt.h +++ b/src/mesa/program/programopt.h @@ -28,6 +28,12 @@ #include "main/mtypes.h" + +#ifdef __cplusplus +extern "C" { +#endif + + extern void _mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog); @@ -52,4 +58,8 @@ extern void _mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog); +#ifdef __cplusplus +} +#endif + #endif /* PROGRAMOPT_H */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
