diff options
| author | José Fonseca <[email protected]> | 2011-11-09 10:20:51 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-11-09 10:24:37 +0000 |
| commit | 63e7a4c6e5bf51d8090046ebc5adcb4207448565 (patch) | |
| tree | b701753960e53fe36889273def9d28e0059445d6 /src/mesa/main/formats.h | |
| parent | f4b42aa5b7a3d11f839d5576b4c42406529131be (diff) | |
mesa,glsl,mapi: Put extern "C" { ... } where appropriate.
Probably a several places missing, but enough to cover all headers
(in)directly included by uniform_query.cpp, and fix the MSVC build.
Diffstat (limited to 'src/mesa/main/formats.h')
| -rw-r--r-- | src/mesa/main/formats.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h index f24d52548de..b2cb750aa94 100644 --- a/src/mesa/main/formats.h +++ b/src/mesa/main/formats.h @@ -35,6 +35,12 @@ #include <GL/gl.h> + +#ifdef __cplusplus +extern "C" { +#endif + + /* OpenGL doesn't have GL_UNSIGNED_BYTE_4_4, so we must define our own type * for GL_LUMINANCE4_ALPHA4. */ #define MESA_UNSIGNED_BYTE_4_4 (GL_UNSIGNED_BYTE<<1) @@ -322,4 +328,9 @@ GLboolean _mesa_format_matches_format_and_type(gl_format gl_format, GLenum format, GLenum type); + +#ifdef __cplusplus +} +#endif + #endif /* FORMATS_H */ |