Cygnus tools compatibility tweaks.

[simgear.git] / XGL / xglUtils.c

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index fe14d63646a0285332f491c2620241a4f033e1de..971c353b4d9ec0edbb9d2308c0f2bd718043480e 100644 (file)
--- a/XGL/xglUtils.c
+++ b/XGL/xglUtils.c
@@ -1,16 +1,22 @@
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #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"
 
@@ -20,6 +26,7 @@
 #endif
 
 int   xglTraceOn = TRUE ;
+
 #ifndef WIN32
     FILE *xglTraceFd = stdout ;
 #else /* WIN32 */