diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2016-07-20 23:46:23 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2016-07-21 00:02:53 +0200 |
| commit | 991f2d696af5fcac3a419ae64623e9703ea4bb2f (patch) | |
| tree | 7ef5ce62dd225505b3b3c20b20b29bd2410d729f /cogl | |
| parent | 76175a48d50006cc4e7f631b7494605eeef7cac2 (diff) | |
| download | mutter-991f2d696af5fcac3a419ae64623e9703ea4bb2f.tar.gz | |
cogl-gles2: Don't leak gles2 types into mutter
On i686, the GLsizeiptr typedef in cogl-gles2.h conflicts with the
system GL headers, so make sure we don't include both.
https://bugzilla.gnome.org/show_bug.cgi?id=769014
Diffstat (limited to 'cogl')
| -rw-r--r-- | cogl/cogl/cogl-gles2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h index a90d0ceb6..87a06f10a 100644 --- a/cogl/cogl/cogl-gles2.h +++ b/cogl/cogl/cogl-gles2.h @@ -65,7 +65,7 @@ * conflicts we only expose the minimal set of GLES 2.0 types and enums * publicly. */ -#ifdef COGL_COMPILATION +#if defined(COGL_COMPILATION) || defined(COGL_ENABLE_MUTTER_API) #include "cogl-gl-header.h" #else #include <cogl/cogl-gles2-types.h> |