]> git.mxchange.org Git - simgear.git/blobdiff - XGL/xglUtils.c
Cygnus tools compatibility tweaks.
[simgear.git] / XGL / xglUtils.c
index 6980f13559418e1ff81462d7c2be33080b534869..971c353b4d9ec0edbb9d2308c0f2bd718043480e 100644 (file)
@@ -5,16 +5,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
-#ifndef __CYGWIN32__
-#  include <malloc.h>
+#if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
+#  if !defined( HAVE_STL_SGI_PORT )    // Avoid malloc with STLport
+#    include <malloc.h>
+#  endif
 #endif
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 
-#include <string.h>
 
 #include "xgl.h"