Compile time fixes needed to build SimGear on recent cygwin versions.

diff --git a/simgear/math/SGQuat.hxx b/simgear/math/SGQuat.hxx
index 1ac86fe58310bd6857b2f7aa59935de2e15ada7f..c50f185dc022670d97f52b11f9f88f3355cfc041 100644 (file)
--- a/simgear/math/SGQuat.hxx
+++ b/simgear/math/SGQuat.hxx
@@ -18,6 +18,15 @@
 #ifndef SGQuat_H
 #define SGQuat_H
 
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
+
+
 /// 3D Vector Class
 template<typename T>
 class SGQuat {

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 9929028144df6914ae8499b37f8a78dbbd60ebf8..b3f7440f3ad21ff3c1e9ca7817d045c4f7f98b3f 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -56,6 +56,9 @@
 #  endif
 #endif
 
+#if defined (__CYGWIN__)
+#include <ieeefp.h>
+#endif
 
 static ssgSharedPtr<ssgStateSelector> layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static bool state_initialized = false;

diff --git a/simgear/scene/sky/cloudfield.cxx b/simgear/scene/sky/cloudfield.cxx
index f588b86920e3d374cbbb3784699e515015cb2707..809efb520ed6d6849278ac52b5f25ee7119afd44 100644 (file)
--- a/simgear/scene/sky/cloudfield.cxx
+++ b/simgear/scene/sky/cloudfield.cxx
@@ -54,6 +54,11 @@ SG_USING_STD(vector);
 #  endif
 #endif
 
+
+#if defined (__CYGWIN__)
+#include <ieeefp.h>
+#endif
+
 extern SGSky *thesky;
 
 static list_of_culledCloud inViewClouds;

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 2d7c53a92d839558ed32d6d5136180afbf3117b9..d29b7fb1ae01d404df063dfd961c2f5f9bfea336 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -63,6 +63,11 @@ extern "C" int isinf (double);
 #  endif
 #endif
 
+#if defined (__CYGWIN__)
+#include <ieeefp.h>
+#endif
+
+
 #include STL_IOSTREAM
 
 #include <simgear/debug/logstream.hxx>