FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed GLint64 and GLuint64 to use int64_t and uint64_t (pulled in via include/osg/Types) to avoid conflict with Qt5 definitions

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15072 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-08-09 10:16:03 +00:00
parent 8b4ff0f50a
commit e8722e76ea
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osg/GL.in
View File

@ -16,7 +16,8 @@
#include <osg/Config> #include <osg/Config>
#include <osg/Export> #include <osg/Export>
#include <osg/Types>
#cmakedefine OSG_GL1_AVAILABLE #cmakedefine OSG_GL1_AVAILABLE
#cmakedefine OSG_GL2_AVAILABLE #cmakedefine OSG_GL2_AVAILABLE
#cmakedefine OSG_GL3_AVAILABLE #cmakedefine OSG_GL3_AVAILABLE
@ -119,19 +120,11 @@
#ifndef GL_HEADER_HAS_GLINT64 #ifndef GL_HEADER_HAS_GLINT64
#ifdef _WIN32 typedef int64_t GLint64;
typedef __int64 GLint64;
#else
typedef long long int GLint64;
#endif
#endif #endif
#ifndef GL_HEADER_HAS_GLUINT64 #ifndef GL_HEADER_HAS_GLUINT64
#ifdef _WIN32 typedef uint64_t GLuint64;
typedef unsigned __int64 GLuint64;
#else
typedef unsigned long long int GLuint64;
#endif
#endif #endif
#ifdef OSG_GL_MATRICES_AVAILABLE #ifdef OSG_GL_MATRICES_AVAILABLE