UIUC flight model contribution. This is based on LaRCsim, but can read

[flightgear.git] / src / WeatherCM / FGLocalWeatherDatabase.h

diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h
index 817ea34b7b6985469dbd3daaf6c9194969d84808..7155854ae70dcad9193ea2604a657c55b337cb9e 100644 (file)
--- a/src/WeatherCM/FGLocalWeatherDatabase.h
+++ b/src/WeatherCM/FGLocalWeatherDatabase.h
@@ -55,9 +55,9 @@ HISTORY
 /****************************************************************************/
 #include <vector>
 
-#include <sg.h>
+#include <plib/sg.h>
 
-#include <Math/sphrintp.h>
+#include "sphrintp.h"
 
 #include "FGPhysicalProperties.h"
 #include "FGPhysicalProperty.h"
@@ -158,7 +158,15 @@ public:
     /************************************************************************/
     /* Get the physical properties on the specified point p                */
     /************************************************************************/
+#ifdef MACOS
+    /* fix a problem with mw compilers in that they don't know the
+       difference between the next two methods. Since the first one
+       doesn't seem to be used anywhere, I commented it out. This is
+       supposed to be fixed in the forthcoming CodeWarrior Release
+       6. */
+#else
     FGPhysicalProperties get(const sgVec2& p) const;
+#endif
     FGPhysicalProperty   get(const sgVec3& p) const;
 
     WeatherPrecision     getAirDensity(const sgVec3& p) const;