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/glheader.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/glheader.h')
| -rw-r--r-- | mesalib/src/mesa/main/glheader.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h index c4fb1570d..7980111b5 100644 --- a/mesalib/src/mesa/main/glheader.h +++ b/mesalib/src/mesa/main/glheader.h @@ -54,6 +54,11 @@ #include "GL/glext.h" +#ifdef __cplusplus +extern "C" { +#endif + + /** * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet). */ @@ -172,4 +177,9 @@ typedef void *GLeglImageOES; #define GLX_DONT_CARE 0xFFFFFFFF + +#ifdef __cplusplus +} +#endif + #endif /* GLHEADER_H */ |