Merge pull request #538 from tpaviot/review/MinGW-OpenGl-fixes

Fix TKOpenGl MinGW compilation
tpaviot · Nov 19, 2014 · 98ad2d7 · 98ad2d7
2 parents 4e57d6a + 07f077b
commit 98ad2d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/OpenGl/OpenGl_ShaderObject.cxx b/src/OpenGl/OpenGl_ShaderObject.cxx
@@ -20,7 +20,7 @@
 #include <Standard_Assert.hxx>
 #include <TCollection_AsciiString.hxx>
 
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__MINGW32__)
 #include <malloc.h>
 #endif
 

diff --git a/src/OpenGl/OpenGl_ShaderProgram.cxx b/src/OpenGl/OpenGl_ShaderProgram.cxx
@@ -24,7 +24,7 @@
 #include <OpenGl_ShaderProgram.hxx>
 #include <OpenGl_ShaderManager.hxx>
 
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__MINGW32__)
 #include <malloc.h>
 #endif