isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl-gles2: Don't leak gles2 types into mutter

Browse Source 
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
This commit is contained in:
Florian Müllner 2016-07-20 23:46:23 +02:00
parent 76175a48d5
commit 991f2d696a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl/cogl-gles2.h
View File

@ -65,7 +65,7 @@
* conflicts we only expose the minimal set of GLES 2.0 types and enums * conflicts we only expose the minimal set of GLES 2.0 types and enums
* publicly. * publicly.
*/ */
#ifdef COGL_COMPILATION #if defined(COGL_COMPILATION) || defined(COGL_ENABLE_MUTTER_API)
#include "cogl-gl-header.h" #include "cogl-gl-header.h"
#else #else
#include <cogl/cogl-gles2-types.h> #include <cogl/cogl-gles2-types.h>