Module: Mesa Branch: master Commit: 672257dc6977c6feffa482bb0493be4d1fa59c14 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=672257dc6977c6feffa482bb0493be4d1fa59c14
Author: Ilia Mirkin <[email protected]> Date: Sat Jan 9 01:04:34 2016 -0500 st/mesa: allow st_format.h to be included from C++ files Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Dave Airlie <[email protected]> --- src/mesa/state_tracker/st_format.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/state_tracker/st_format.h b/src/mesa/state_tracker/st_format.h index 90e00e8..3e10aa6 100644 --- a/src/mesa/state_tracker/st_format.h +++ b/src/mesa/state_tracker/st_format.h @@ -36,6 +36,10 @@ #include "pipe/p_defines.h" #include "pipe/p_format.h" +#ifdef __cplusplus +extern "C" { +#endif + struct gl_context; struct pipe_screen; @@ -77,4 +81,8 @@ st_translate_color(const union gl_color_union *colorIn, union pipe_color_union *colorOut, GLenum baseFormat, GLboolean is_integer); +#ifdef __cplusplus +} +#endif + #endif /* ST_FORMAT_H */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
