+#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
#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
{