Cygnus tools compatibility tweaks.

[simgear.git] / XGL / xglUtils.c

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index 3f4f452e5841b1f040891c7273401ee74e35d0b1..971c353b4d9ec0edbb9d2308c0f2bd718043480e 100644 (file)
--- a/XGL/xglUtils.c
+++ b/XGL/xglUtils.c
@@ -1,17 +1,23 @@
 
+#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 WIN32
-#  include <windows.h>
-#else
+#ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 
+
 #include "xgl.h"
 
 #ifndef TRUE
@@ -20,7 +26,13 @@
 #endif
 
 int   xglTraceOn = TRUE ;
-FILE *xglTraceFd = stdout ;
+
+#ifndef WIN32
+    FILE *xglTraceFd = stdout ;
+#else /* WIN32 */
+    /* Bail for now, we just want it to compile I guess */
+    FILE *xglTraceFd = NULL;
+#endif /* WIN32 */
 
 struct GLenumLookup
 {