From 240842ff687b74cce34126f5f5beac14bbbf1134 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Wed, 14 Dec 2005 16:18:30 +0000
Subject: [PATCH] Try to build native cygwin using 'make PLATFORM=lnx'

---
 goldlib/gall/gdefs.h |  4 ++--
 goldlib/gall/gfile.h | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index 035281e..067f616 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -38,7 +38,7 @@
 #ifdef _MSC_VER
 #include <windows.h>
 #include <limits.h>
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) || defined(__CYGWIN__)
 #include <stdint.h>
 #else
 #endif
@@ -129,7 +129,7 @@ typedef unsigned int    uint32_t;
 #endif
 #endif  /*#ifdef _MSC_VER */
 
-#if defined(__GNUC__) && !defined(__MINGW32__)
+#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 typedef unsigned char  uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
diff --git a/goldlib/gall/gfile.h b/goldlib/gall/gfile.h
index 449ccef..d39c0c2 100644
--- a/goldlib/gall/gfile.h
+++ b/goldlib/gall/gfile.h
@@ -156,12 +156,17 @@ public:
   gfile& operator>> (uint8_t& i);
   gfile& operator>> (uint16_t& i);
   gfile& operator>> (uint32_t& i);
+  #if !defined(__CYGWIN__)
   gfile& operator>> (unsigned long& i);
+  #endif
+
   gfile& operator>> (char& i)     { return operator>>((uint8_t&)i); }
   gfile& operator>> (int8_t& i)   { return operator>>((uint8_t&)i); }
   gfile& operator>> (int16_t& i)  { return operator>>((uint16_t&)i); }
   gfile& operator>> (int32_t& i)  { return operator>>((uint32_t&)i); }
+  #if !defined(__CYGWIN__)
   gfile& operator>> (long& i)     { return operator>>((unsigned long&)i); }
+  #endif
 
   #ifdef __GOLDWARE_HAS_BOOL
   gfile& operator<< (bool o);
@@ -169,12 +174,17 @@ public:
   gfile& operator<< (uint8_t o);
   gfile& operator<< (uint16_t o);
   gfile& operator<< (uint32_t o);
+  #if !defined(__CYGWIN__)
   gfile& operator<< (unsigned long o);
+  #endif
+
   gfile& operator<< (char o)      { return operator<<((uint8_t )o); }
   gfile& operator<< (int8_t  o)   { return operator<<((uint8_t )o); }
   gfile& operator<< (int16_t  o)  { return operator<<((uint16_t)o); }
   gfile& operator<< (int32_t o)   { return operator<<((uint32_t)o); }
+  #if !defined(__CYGWIN__)
   gfile& operator<< (long o)      { return operator<<((unsigned long)o); }
+  #endif
 
 };