- A few fixes to ensure SimGear compiles again on cygwin.

  * on cygwin, isnan is declared in ieeepf.h
  * CYGWIN is a special case in that it is windows based, but sometimes
    folows unix conventions. SGAtomic compilation failed on an illegal
    volatile type cast without the additional __CYGWIN__ define check.

diff --git a/simgear/math/SGVec2.hxx b/simgear/math/SGVec2.hxx
index 6b49bc619afb644cdb272963d02a4288f4aa8eb3..0409ee44695488c72c08babe25d7876b435282b7 100644 (file)
--- a/simgear/math/SGVec2.hxx
+++ b/simgear/math/SGVec2.hxx
@@ -18,6 +18,10 @@
 #ifndef SGVec2_H
 #define SGVec2_H
 
+#if defined ( __CYGWIN__ )
+#include <ieeefp.h>
+#endif
+
 #include <osg/Vec2f>
 #include <osg/Vec2d>
 

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 9c02cb96c2f18e062b64021585fe9ee9ccbac847..5bf353cb3824ea981f8e6a0a0d6c40daa22342fd 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -33,6 +33,10 @@
 #  include <windows.h>
 #endif
 
+#if defined ( __CYGWIN__ )
+#include <ieeefp.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/structure/exception.hxx>

diff --git a/simgear/scene/sky/sphere.cxx b/simgear/scene/sky/sphere.cxx
index bbd6869411068edc2643ffda990381a6863fdd41..43d20e1c43b70767ef84ad837923838c17ce10fa 100644 (file)
--- a/simgear/scene/sky/sphere.cxx
+++ b/simgear/scene/sky/sphere.cxx
@@ -20,6 +20,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
+#ifdef __CYGWIN__
+#include <ieeefp.h>
+#endif
 
 
 #include <simgear/compiler.h>

diff --git a/simgear/scene/sky/stars.cxx b/simgear/scene/sky/stars.cxx
index bd31aedcfb56b751751aaea87b3e4a3a8f2b96bb..55616f68837cf14e7c2ea43faad92bf804494acb 100644 (file)
--- a/simgear/scene/sky/stars.cxx
+++ b/simgear/scene/sky/stars.cxx
@@ -27,6 +27,10 @@
 #  include <simgear_config.h>
 #endif
 
+#ifdef __CYGWIN__
+#include <ieeefp.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>

diff --git a/simgear/structure/SGAtomic.hxx b/simgear/structure/SGAtomic.hxx
index 29c23c2511ddfe631264573a385e1e0a573c4e91..4029f3527fb91938f0871ee8670e454118faf93e 100644 (file)
--- a/simgear/structure/SGAtomic.hxx
+++ b/simgear/structure/SGAtomic.hxx
@@ -28,7 +28,7 @@
 #elif defined(__sgi) && defined(_COMPILER_VERSION) && (_COMPILER_VERSION>=730)
 // No need to include something. Is a Compiler API ...
 # define SGATOMIC_USE_MIPSPRO_BUILTINS
-#elif defined(WIN32) 
+#elif defined(WIN32)  && !defined ( __CYGWIN__ )
 # include <windows.h>
 # define SGATOMIC_USE_WIN32_INTERLOCKED
 #else