diff options
| author | Mark Janes <[email protected]> | 2015-03-04 16:37:29 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-03-05 10:21:40 -0800 |
| commit | 237dcb4aa7c39c59bfd225ae3d73caf709be216d (patch) | |
| tree | 9139b596ac2383fa3e4ada351b94000ba9319e5f /src/mesa/vbo | |
| parent | 2e4c95dfe2cb205c327ceaa12b44a9273bdb20dc (diff) | |
Fix invalid extern "C" around header inclusion.
System headers may contain C++ declarations, which cannot be given C
linkage. For this reason, include statements should never occur
inside extern "C".
This patch moves the C linkage statements to enclose only the
declarations within a single header.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo.h | 8 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_context.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 6e1a4aa1ad6..54dee6c464f 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -35,6 +35,10 @@ #include <stdbool.h> #include "main/glheader.h" +#ifdef __cplusplus +extern "C" { +#endif + struct gl_client_array; struct gl_context; struct gl_transform_feedback_object; @@ -228,4 +232,8 @@ _es_VertexAttrib3fv(GLuint indx, const GLfloat* values); void GLAPIENTRY _es_VertexAttrib4fv(GLuint indx, const GLfloat* values); +#ifdef __cplusplus +} // extern "C" +#endif + #endif diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 3b454be4422..6099b56e661 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -58,6 +58,10 @@ #include "main/macros.h" +#ifdef __cplusplus +extern "C" { +#endif + struct vbo_context { struct gl_client_array currval[VBO_ATTRIB_MAX]; @@ -175,4 +179,8 @@ vbo_get_default_vals_as_union(GLenum format) } } +#ifdef __cplusplus +} // extern "C" +#endif + #endif |