diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
| commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
| tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /mesalib/src/mesa/main/shaderapi.h | |
| parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
| parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
| download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/mesa/main/shaderapi.h')
| -rw-r--r-- | mesalib/src/mesa/main/shaderapi.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h index bec448dee..0ffebdb07 100644 --- a/mesalib/src/mesa/main/shaderapi.h +++ b/mesalib/src/mesa/main/shaderapi.h @@ -29,6 +29,12 @@ #include "glheader.h" + +#ifdef __cplusplus +extern "C" { +#endif + + struct _glapi_table; struct gl_context; struct gl_shader_program; @@ -194,4 +200,9 @@ _mesa_ActiveProgramEXT(GLuint program); extern GLuint GLAPIENTRY _mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string); + +#ifdef __cplusplus +} +#endif + #endif /* SHADERAPI_H */ |