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

[Florian Müllner <fmuellner src gnome org>]

commit 991f2d696af5fcac3a419ae64623e9703ea4bb2f
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Jul 20 23:46:23 2016 +0200

    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

 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 a90d0ce..87a06f1 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>