Latest changes from Jon, plus ...

[flightgear.git] / JSBsim / FGPosition.cpp

diff --git a/JSBsim/FGPosition.cpp b/JSBsim/FGPosition.cpp
index 51b49c459dc88ace28508623bdeb73fd07f32a9f..2f7eb655c03fa6b5679383a277ea2449b55b0c63 100644 (file)
--- a/JSBsim/FGPosition.cpp
+++ b/JSBsim/FGPosition.cpp
@@ -53,7 +53,17 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 *******************************************************************************/
 
-#include <math.h>
+#ifdef FGFS
+#  include <Include/compiler.h>
+#  ifdef FG_HAVE_STD_INCLUDES
+#    include <cmath>
+#  else
+#    include <math.h>
+#  endif
+#else
+#  include <cmath>
+#endif
+
 #include "FGPosition.h"
 #include "FGAtmosphere.h"
 #include "FGState.h"
@@ -72,7 +82,7 @@ INCLUDES
 
 FGPosition::FGPosition(FGFDMExec* fdmex) : FGModel(fdmex)
 {
-  strcpy(Name, "FGPosition");
+  Name = "FGPosition";
   AccelN = AccelE = AccelD = 0.0;
   LongitudeDot = LatitudeDot = RadiusDot = 0.0;
 }