diff options
| author | Brian Paul <brianp@vmware.com> | 2014-12-15 16:36:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-12-16 07:52:41 -0700 |
| commit | 3ebc135b4ed261cb7959dd7429773b25ce545102 (patch) | |
| tree | c5ea5bf801671ea249abfa0dcf6266d1b2f713bb /src/mesa | |
| parent | 4b342fbbb739b4266ec6bdaa59d1807b75199061 (diff) | |
mesa: put extern "C" in header files
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/enums.h | 11 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.h | 9 | ||||
| -rw-r--r-- | src/mesa/main/texenvprogram.h | 11 | ||||
| -rw-r--r-- | src/mesa/main/texobj.h | 10 |
4 files changed, 41 insertions, 0 deletions
diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h index 36c053d4bc5..66bdd53bbab 100644 --- a/src/mesa/main/enums.h +++ b/src/mesa/main/enums.h @@ -37,6 +37,11 @@ #define _ENUMS_H_ +#ifdef __cplusplus +extern "C" { +#endif + + extern const char *_mesa_lookup_enum_by_nr( int nr ); /* Get the name of an enum given that it is a primitive type. Avoids @@ -44,4 +49,10 @@ extern const char *_mesa_lookup_enum_by_nr( int nr ); */ const char *_mesa_lookup_prim_by_nr( unsigned nr ); + +#ifdef __cplusplus +} +#endif + + #endif diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h index 7d80b383d74..1bb3193e432 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -27,6 +27,11 @@ #ifndef SAMPLEROBJ_H #define SAMPLEROBJ_H +#ifdef __cplusplus +extern "C" { +#endif + + struct dd_function_table; static inline struct gl_sampler_object * @@ -103,4 +108,8 @@ _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params); void GLAPIENTRY _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params); +#ifdef __cplusplus +} +#endif + #endif /* SAMPLEROBJ_H */ diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h index 15ab31a5003..11439f13b35 100644 --- a/src/mesa/main/texenvprogram.h +++ b/src/mesa/main/texenvprogram.h @@ -27,9 +27,20 @@ #define TEXENVPROGRAM_H +#ifdef __cplusplus +extern "C" { +#endif + + struct gl_context; extern struct gl_shader_program * _mesa_get_fixed_func_fragment_program(struct gl_context *ctx); + +#ifdef __cplusplus +} +#endif + + #endif diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index b1b7a302755..efcd7661e26 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -38,6 +38,11 @@ #include "samplerobj.h" +#ifdef __cplusplus +extern "C" { +#endif + + /** * \name Internal functions */ @@ -212,4 +217,9 @@ _mesa_InvalidateTexImage(GLuint texture, GLint level); /*@}*/ +#ifdef __cplusplus +} +#endif + + #endif |