Cygnus tools compatibility tweaks.

[simgear.git] / XGL / xglUtils.c

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index e727cea8e0328fee33fb8c6b1fe96925557432b2..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,12 +26,13 @@
 #endif
 
 int   xglTraceOn = TRUE ;
-#ifndef __CYGWIN32__
+
+#ifndef WIN32
     FILE *xglTraceFd = stdout ;
-#else /* __CYGWIN32__ */
+#else /* WIN32 */
     /* Bail for now, we just want it to compile I guess */
     FILE *xglTraceFd = NULL;
-#endif /* __CYGWIN32 */
+#endif /* WIN32 */
 
 struct GLenumLookup
 {