From e8722e76ea743f7bbcce5e717800bce1e2049db0 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 9 Aug 2015 10:16:03 +0000
Subject: [PATCH] Changed GLint64 and GLuint64 to use int64_t and uint64_t
 (pulled in via include/osg/Types) to avoid conflict with Qt5 definitions

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15072 16af8721-9629-0410-8352-f15c8da7e697
---
 src/osg/GL.in | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/osg/GL.in b/src/osg/GL.in
index 905740dc3..19872775a 100644
--- a/src/osg/GL.in
+++ b/src/osg/GL.in
@@ -16,7 +16,8 @@
 
 #include <osg/Config>
 #include <osg/Export>
-
+#include <osg/Types>
+ 
 #cmakedefine OSG_GL1_AVAILABLE
 #cmakedefine OSG_GL2_AVAILABLE
 #cmakedefine OSG_GL3_AVAILABLE
@@ -119,19 +120,11 @@
 
 
 #ifndef GL_HEADER_HAS_GLINT64
-    #ifdef _WIN32
-        typedef __int64 GLint64;
-    #else
-        typedef long long int GLint64;
-    #endif
+    typedef int64_t GLint64;
 #endif
 
 #ifndef GL_HEADER_HAS_GLUINT64
-    #ifdef _WIN32
-        typedef unsigned __int64 GLuint64;
-    #else
-        typedef unsigned long long int GLuint64;
-    #endif
+    typedef uint64_t GLuint64;
 #endif
 
 #ifdef OSG_GL_MATRICES_AVAILABLE