projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c31c015
)
also conflict with gl2.h (gles2 headers)
author
Carsten Haitzler
<raster@rasterman.com>
Tue, 3 May 2011 05:53:20 +0000
(
05:53
+0000)
committer
Carsten Haitzler
<raster@rasterman.com>
Tue, 3 May 2011 05:53:20 +0000
(
05:53
+0000)
SVN revision: 59142
legacy/evas/src/lib/Evas_GL.h
patch
|
blob
|
history
diff --git
a/legacy/evas/src/lib/Evas_GL.h
b/legacy/evas/src/lib/Evas_GL.h
index
efeee39
..
8086424
100644
(file)
--- a/
legacy/evas/src/lib/Evas_GL.h
+++ b/
legacy/evas/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/ .