From 6ca9596807dfbcbc3b33b6cd880bc05de43e5969 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 2 Nov 1998 18:25:32 +0000
Subject: [PATCH] Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20
 compilers) Other misc. tweaks.

---
 XGL/xglUtils.c      | 2 +-
 src/slPortability.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index 6980f1355..bc5d7217e 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 09953a5fc..88c1cbcc8 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
-- 
2.39.2