From b83ee4065bf886f0415a26beb9c3035a5536b1a3 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 11 Apr 2024 08:34:50 -0500 Subject: [PATCH] Work around conda-forge's CDT version of GL (#983) * Work around conda-forge's CDT version of GL Signed-off-by: Michael Carroll Co-authored-by: Silvo Traversaro * Remove unnecessary preprocessor Signed-off-by: Michael Carroll --------- Signed-off-by: Michael Carroll Co-authored-by: Silvo Traversaro --- ogre/src/OgreRenderEngine.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc index 7352e747a..778467909 100644 --- a/ogre/src/OgreRenderEngine.cc +++ b/ogre/src/OgreRenderEngine.cc @@ -19,6 +19,14 @@ #if !defined(__APPLE__) && !defined(_WIN32) # include # include + +// conda-forge's glext.h is old and has a bug. +// This is a minimally-intrusive fix to correct types. +// On modern GL distributions, glx.h will override these. +# include +typedef khronos_ssize_t GLsizeiptr; +typedef khronos_intptr_t GLintptr; + # include #endif