From: curt <curt>
Date: Mon, 2 Nov 1998 18:25:32 +0000 (+0000)
Subject: Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ca9596807dfbcbc3b33b6cd880bc05de43e5969;hp=5695fc84e1b344307696f383ab42392151d5c091;p=simgear.git

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 6980f135..bc5d7217 100644
--- 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 09953a5f..88c1cbcc 100644
--- 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