From 10558113e8957b5e3c03ad587271e514e200a049 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 19 Dec 2005 16:51:25 +0000
Subject: [PATCH] Cygwin patches from Frederic Bouvier.

---
 src/Airports/GenAirports/apt_surface.cxx | 4 ++++
 src/Airports/GenAirports/elevations.cxx  | 3 +++
 src/Airports/GenAirports/lights.cxx      | 3 +++
 src/BuildTiles/Osgb36/osgbtc.cxx         | 4 ++++
 src/Prep/MergerClipper/testmerger.cxx    | 3 +++
 src/Prep/Terra/GreedyInsert.h            | 2 +-
 src/Prep/Terra/Map.cc                    | 4 ++--
 7 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Airports/GenAirports/apt_surface.cxx b/src/Airports/GenAirports/apt_surface.cxx
index 362ff19f..e857f8b1 100644
--- a/src/Airports/GenAirports/apt_surface.cxx
+++ b/src/Airports/GenAirports/apt_surface.cxx
@@ -22,6 +22,10 @@
 // $Id$
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 // libnewmat includes and defines
diff --git a/src/Airports/GenAirports/elevations.cxx b/src/Airports/GenAirports/elevations.cxx
index fba95d24..8cd3026d 100644
--- a/src/Airports/GenAirports/elevations.cxx
+++ b/src/Airports/GenAirports/elevations.cxx
@@ -22,6 +22,9 @@
 // $Id$
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 // libnewmat includes and defines
 #define WANT_STREAM		// include.h will get stream fns
diff --git a/src/Airports/GenAirports/lights.cxx b/src/Airports/GenAirports/lights.cxx
index d7e4aab4..cf1da64f 100644
--- a/src/Airports/GenAirports/lights.cxx
+++ b/src/Airports/GenAirports/lights.cxx
@@ -21,6 +21,9 @@
 // $Id$
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/math/sg_geodesy.hxx>
 
diff --git a/src/BuildTiles/Osgb36/osgbtc.cxx b/src/BuildTiles/Osgb36/osgbtc.cxx
index a03b5d24..ab77b47e 100644
--- a/src/BuildTiles/Osgb36/osgbtc.cxx
+++ b/src/BuildTiles/Osgb36/osgbtc.cxx
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include "osgb36.hxx"
 #include "uk.hxx"
 
diff --git a/src/Prep/MergerClipper/testmerger.cxx b/src/Prep/MergerClipper/testmerger.cxx
index f2a88bcf..dbdff618 100644
--- a/src/Prep/MergerClipper/testmerger.cxx
+++ b/src/Prep/MergerClipper/testmerger.cxx
@@ -22,6 +22,9 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 --------------------------------------------------------------------------
 */
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <simgear/debug/logstream.hxx>
 #include <simgear/bucket/newbucket.hxx>
 #include <dirent.h>
diff --git a/src/Prep/Terra/GreedyInsert.h b/src/Prep/Terra/GreedyInsert.h
index 0869465a..200c7269 100644
--- a/src/Prep/Terra/GreedyInsert.h
+++ b/src/Prep/Terra/GreedyInsert.h
@@ -33,7 +33,7 @@ public:
     int x, y;
     real import;
 
-    Candidate() { import = -HUGE; }
+    Candidate() { import = -HUGE_VAL; }
 
     void consider(int sx, int sy, real i)
     {
diff --git a/src/Prep/Terra/Map.cc b/src/Prep/Terra/Map.cc
index d5e5b0bd..86cc0d9f 100644
--- a/src/Prep/Terra/Map.cc
+++ b/src/Prep/Terra/Map.cc
@@ -8,8 +8,8 @@ using std::endl;
 
 void Map::findLimits()
 {
-    min = HUGE;
-    max = -HUGE;
+    min = HUGE_VAL;
+    max = -HUGE_VAL;
 
     for(int i=0;i<width;i++)
 	for(int j=0;j<height;j++)