Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)

Other misc. tweaks.

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index 6980f13559418e1ff81462d7c2be33080b534869..bc5d7217e11f4f417c546bf4b914e04693f42cce 100644 (file)
--- a/XGL/xglUtils.c
+++ b/XGL/xglUtils.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef __CYGWIN32__
+#if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
 #  include <malloc.h>
 #endif
 

diff --git a/src/slPortability.h b/src/slPortability.h
index 09953a5fc0bf87e9d222afcf3cd2624d87b1c1de..88c1cbcc8daac03cbd51b7df545cce576fa3a396 100644 (file)
--- a/src/slPortability.h
+++ b/src/slPortability.h
@@ -19,10 +19,9 @@
 #include <sys/ioctl.h>
 #else
 #include <windows.h>
-#ifdef __CYGWIN32__
+#if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
 #  define NEAR /* */
 #  define FAR  /* */
-#  define WHERE_EVER_YOU_ARE /* Curt: optional, but it reminds me of a song */
 #endif
 #include <mmsystem.h>
 #endif