math domain error fix from Charlie Hotchkiss.

diff --git a/Astro/celestialBody.cxx b/Astro/celestialBody.cxx
index 72bb6359aed968fe0e1692d1bc39f3a4ec2b1d28..35b01e2447bd4199ee99b0f977d73e07c9f1a570 100644 (file)
--- a/Astro/celestialBody.cxx
+++ b/Astro/celestialBody.cxx
@@ -27,7 +27,7 @@
 #include "star.hxx"
 #include <Debug/logstream.hxx>
 
-#ifdef __BORLANDC__
+#ifdef FG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
 #endif
 #include <math.h>
@@ -90,7 +90,19 @@ void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
   //of the planet
   R = sqrt (xg*xg + yg*yg + zg*zg);
   s = ourSun->getDistance();
-  FV = RAD_TO_DEG * acos( (r*r + R*R - s*s) / (2*r*R));
+
+  // It is possible from these calculations for the argument to acos
+  // to exceed the valid range for acos(). So we do a little extra
+  // checking.
+
+  double tmp = (r*r + R*R - s*s) / (2*r*R);
+  if ( tmp > 1.0) { 
+      tmp = 1.0;
+  } else if ( tmp < -1.0) {
+      tmp = -1.0;
+  }
+
+  FV = RAD_TO_DEG * acos( tmp );
 };
 
 /****************************************************************************