From 716cfbffa477370cb9a40206a1583c78ae844bb0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 7 Jan 2014 19:06:44 +0000 Subject: [PATCH] Refined the GLint64 definitions --- include/osg/GL | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/osg/GL b/include/osg/GL index 1f387c624..740230101 100644 --- a/include/osg/GL +++ b/include/osg/GL @@ -107,8 +107,8 @@ #define GL3_PROTOTYPES 1 #ifdef __APPLE__ - #include - #include + #include + #include #define GLint64EXT GLint64 #define GLuint64EXT GLuint64 #define GL_BGRA_EXT GL_BGRA @@ -130,7 +130,18 @@ #endif #endif #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 #ifndef GL_APIENTRY #define GL_APIENTRY APIENTRY