diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
| commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
| tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /mesalib/src/mesa/main/teximage.h | |
| parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
| parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
| download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.h')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h index e2bdaca01..66a0c8895 100644 --- a/mesalib/src/mesa/main/teximage.h +++ b/mesalib/src/mesa/main/teximage.h @@ -35,6 +35,9 @@ #include "mtypes.h" #include "formats.h" +#ifdef __cplusplus +extern "C" { +#endif /** Is the given value one of the 6 cube faces? */ static inline GLboolean @@ -287,4 +290,8 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer); /*@}*/ +#ifdef __cplusplus +} +#endif + #endif |