From 60bb2750bfa8d26c241a1c13ab619b61357b2ca8 Mon Sep 17 00:00:00 2001 From: raster Date: Tue, 3 May 2011 05:53:20 +0000 Subject: [PATCH] also conflict with gl2.h (gles2 headers) git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@59142 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/Evas_GL.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/Evas_GL.h b/src/lib/Evas_GL.h index efeee39..8086424 100644 --- a/src/lib/Evas_GL.h +++ b/src/lib/Evas_GL.h @@ -462,8 +462,10 @@ EAPI Eina_Bool evas_gl_native_surface_get (Evas_GL *evas_gl, Evas */ EAPI Evas_GL_API *evas_gl_api_get (Evas_GL *evas_gl) EINA_ARG_NONNULL(1); -#ifndef __gl_h_ -#define __gl_h_ +#if !defined(__gl_h_) && !defined(__gl2_h_) +# define __gl_h_ +# define __gl2_h_ + /* * This document is licensed under the SGI Free Software B License Version * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . -- 2.7.4