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

---
 Airports/simple.hxx | 6 +++++-
 Joystick/js.cxx     | 2 +-
 Main/GLUTkey.cxx    | 6 ++++--
 Time/fg_time.cxx    | 6 +++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Airports/simple.hxx b/Airports/simple.hxx
index dd2399b0f..96faba2c2 100644
--- a/Airports/simple.hxx
+++ b/Airports/simple.hxx
@@ -70,7 +70,7 @@ operator >> ( istream& in, fgAIRPORT& a )
 
 class fgAIRPORTS {
 public:
-#ifdef _FG_NO_DEFAULT_TEMPLATE_ARGS
+#ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
     typedef set< fgAIRPORT, less< fgAIRPORT > > container;
 #else
     typedef set< fgAIRPORT > container;
@@ -105,6 +105,10 @@ public:
 
 
 // $Log$
+// Revision 1.5  1998/11/02 18:25:34  curt
+// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
+// Other misc. tweaks.
+//
 // Revision 1.4  1998/09/08 21:38:43  curt
 // Changes by Bernie Bright.
 //
diff --git a/Joystick/js.cxx b/Joystick/js.cxx
index d81ec696d..8f25dec82 100644
--- a/Joystick/js.cxx
+++ b/Joystick/js.cxx
@@ -1,5 +1,5 @@
 
-#include "js.h"
+#include "js.hxx"
 
 jsJoystick js0 ( 0 ) ;
 jsJoystick js1 ( 1 ) ;
diff --git a/Main/GLUTkey.cxx b/Main/GLUTkey.cxx
index 85b6969bf..21d5461f0 100644
--- a/Main/GLUTkey.cxx
+++ b/Main/GLUTkey.cxx
@@ -272,10 +272,8 @@ void GLUTkey(unsigned char k, int x, int y) {
 
 // Handle "special" keyboard events
 void GLUTspecialkey(int k, int x, int y) {
-    fgCONTROLS *c;
     fgVIEW *v;
 
-    c = current_aircraft.controls;
     v = &current_view;
 
     fgPrintf( FG_INPUT, FG_DEBUG, "Special key hit = %d", k);
@@ -389,6 +387,10 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 // $Log$
+// Revision 1.31  1998/11/02 18:25:37  curt
+// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
+// Other misc. tweaks.
+//
 // Revision 1.30  1998/10/25 14:08:46  curt
 // Turned "struct fgCONTROLS" into a class, with inlined accessor functions.
 //
diff --git a/Time/fg_time.cxx b/Time/fg_time.cxx
index 4cdb20c76..0fe810bd3 100644
--- a/Time/fg_time.cxx
+++ b/Time/fg_time.cxx
@@ -44,7 +44,7 @@
 
 #ifdef  WIN32
 #  include <windows.h>
-#  ifdef __CYGWIN32__
+#  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
 #    define NEAR /* */
 #    define FAR  /* */
 #  endif
@@ -448,6 +448,10 @@ void fgTimeUpdate(fgFLIGHT *f, fgTIME *t) {
 
 
 // $Log$
+// Revision 1.20  1998/11/02 18:25:38  curt
+// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
+// Other misc. tweaks.
+//
 // Revision 1.19  1998/10/17 01:34:29  curt
 // C++ ifying ...
 //