From 5cb305041dd062856e8b2127cd494238564f591b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 20 Jan 2014 15:10:49 +0000
Subject: [PATCH] =?UTF-8?q?From=20Stephan=20Huber,=20"recent=20commits=20r?=
 =?UTF-8?q?egarding=20GLuint64EXT=20broke=20the=20build=20for=20GLES1=20an?=
 =?UTF-8?q?d=20GLES2.=20Attached=20you=E2=80=99ll=20find=20a=20fix=20which?=
 =?UTF-8?q?=20hopefully=20work=20for=20every=20platform."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/osg/GL | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/include/osg/GL b/include/osg/GL
index 5667ad440..7d6093062 100644
--- a/include/osg/GL
+++ b/include/osg/GL
@@ -131,17 +131,7 @@
             #endif
         #endif
 
-        #if !defined(GL_EXT_timer_query)
-            #ifdef _WIN32
-                typedef          __int64 GLint64EXT;
-                typedef unsigned __int64 GLuint64EXT;
-            #else
-                typedef long long int GLint64EXT;
-                typedef unsigned long long int GLuint64EXT;
-            #endif
-        #endif
-
-#endif
+    #endif
 
     #ifndef GL_APIENTRY
         #define GL_APIENTRY APIENTRY
@@ -150,6 +140,17 @@
 #endif
 
 
+#if !defined(GL_EXT_timer_query) && !defined(OSG_GL3_AVAILABLE)
+
+    #ifdef _WIN32
+        typedef          __int64 GLint64EXT;
+        typedef unsigned __int64 GLuint64EXT;
+    #else
+        typedef long long int GLint64EXT;
+        typedef unsigned long long int GLuint64EXT;
+    #endif
+#endif
+
 #ifdef OSG_GL_MATRICES_AVAILABLE
 
     inline void glLoadMatrix(const float* mat) { glLoadMatrixf(static_cast<const GLfloat*>(mat)); }