Tweaks to build with newest gcc under Irix contributed by Erik Hofman.

diff --git a/src/NetworkOLK/net_send.cxx b/src/NetworkOLK/net_send.cxx
index 80724cc78cda982ea8ffe15831f1b8f182b1fd2e..2147ded22c6099e11f5ad47338ad73f2851b1aa0 100644 (file)
--- a/src/NetworkOLK/net_send.cxx
+++ b/src/NetworkOLK/net_send.cxx
@@ -32,6 +32,7 @@
 /*************************************************************/
 
 #include <stdio.h>
+#include <strings.h>
 #include "fgd.h"
 
 /* I prefer NHV's decl. */

diff --git a/src/WeatherCM/FGCloud.h b/src/WeatherCM/FGCloud.h
index 2995e08929a0e57ea3b8373e15f7ba8b397093af..844cec44930053781b4de9a1f294b4fc7582b046 100644 (file)
--- a/src/WeatherCM/FGCloud.h
+++ b/src/WeatherCM/FGCloud.h
@@ -64,4 +64,4 @@ public:
 };
 
 /****************************************************************************/
-#endif /*FGCloud_H*/
\ No newline at end of file
+#endif /*FGCloud_H*/

diff --git a/src/WeatherCM/FGCloudItem.h b/src/WeatherCM/FGCloudItem.h
index 652ddccd743eeb54be6575f31ddc229afaf81729..4b6260d961e2fe50aab4af0e9c96909a37973768 100644 (file)
--- a/src/WeatherCM/FGCloudItem.h
+++ b/src/WeatherCM/FGCloudItem.h
@@ -74,4 +74,4 @@ public:
 };
 
 /****************************************************************************/
-#endif /*FGCloudItem_H*/
\ No newline at end of file
+#endif /*FGCloudItem_H*/

diff --git a/src/WeatherCM/FGSnowRain.h b/src/WeatherCM/FGSnowRain.h
index b1dd713d4d7bb8cb9ba24878b2fba30f40442c2a..bf82101af73dee84837263ed87d116a4ac5f38f7 100644 (file)
--- a/src/WeatherCM/FGSnowRain.h
+++ b/src/WeatherCM/FGSnowRain.h
@@ -72,4 +72,4 @@ public:
 };
 
 /****************************************************************************/
-#endif /*FGSnowRain_H*/
\ No newline at end of file
+#endif /*FGSnowRain_H*/

diff --git a/src/WeatherCM/FGWeatherUtils.h b/src/WeatherCM/FGWeatherUtils.h
index 485c120359ad059d30f95d20f272835bb799743c..cf25b988dfb6a77af9250b8055ac3fdfd8988ca1 100644 (file)
--- a/src/WeatherCM/FGWeatherUtils.h
+++ b/src/WeatherCM/FGWeatherUtils.h
@@ -211,4 +211,4 @@ inline WeatherPrecision Pascal2psf      (const WeatherPrecision Pascal)
 /****************************************************************************/
 
 /****************************************************************************/
-#endif /*FGWeatherUtils_H*/
\ No newline at end of file
+#endif /*FGWeatherUtils_H*/

diff --git a/src/WeatherCM/linintp2.inl b/src/WeatherCM/linintp2.inl
index 1fd489d1b39b0f5715c37011454f6e5f6c9f0b14..20dc2a8571adaa85bee81101699a74ad640b0b84 100644 (file)
--- a/src/WeatherCM/linintp2.inl
+++ b/src/WeatherCM/linintp2.inl
@@ -101,12 +101,18 @@ template<class T>
 void mgcLinInterp2D<T>::ComputeBarycenter (Vertex& v0, Vertex& v1, Vertex& v2, 
                                            Vertex& ver, double c[3])
 {
-    double A0 = v0.x-v2.x, B0 = v0.y-v2.y;
-    double A1 = v1.x-v2.x, B1 = v1.y-v2.y;
-    double A2 = ver.x-v2.x, B2 = ver.y-v2.y;
-
-    double m00 = A0*A0+B0*B0, m01 = A0*A1+B0*B1, m11 = A1*A1+B1*B1;
-    double r0 = A2*A0+B2*B0, r1 = A2*A1+B2*B1;
+    double A0 = v0.x-v2.x;
+    double B0 = v0.y-v2.y;
+    double A1 = v1.x-v2.x;
+    double B1 = v1.y-v2.y;
+    double A2 = ver.x-v2.x;
+    double B2 = ver.y-v2.y;
+
+    double m00 = A0*A0+B0*B0;
+    double m01 = A0*A1+B0*B1;
+    double m11 = A1*A1+B1*B1;
+    double r0 = A2*A0+B2*B0;
+    double r1 = A2*A1+B2*B1;
     double det = m00*m11-m01*m01;
 
     c[0] = (m11*r0-m01*r1)/det;