A couple MSVC++ portability tweaks.

diff --git a/src/FDM/JSBSim/FGAircraft.cpp b/src/FDM/JSBSim/FGAircraft.cpp
index bdcd53c4bf54d5d076e0a8299bc5131f81bd0337..18be53e265f55a3db3912e13455c74061488c4f2 100644 (file)
--- a/src/FDM/JSBSim/FGAircraft.cpp
+++ b/src/FDM/JSBSim/FGAircraft.cpp
@@ -168,7 +168,7 @@ bool FGAircraft::LoadAircraft(string aircraft_path, string engine_path, string f
   while (!aircraftfile.fail()) {
        holding_string.erase();
     aircraftfile >> holding_string;
-#if defined(__BORLANDC__) || defined(FG_HAVE_NATIVE_SGI_COMPILERS)
+#if defined(__BORLANDC__) || defined(FG_HAVE_NATIVE_SGI_COMPILERS) || defined(_MSC_VER)
     if (holding_string.compare(0, 2, "//") != 0) {
 #else
     if (holding_string.compare("//",0,2) != 0) {

diff --git a/src/FDM/JSBSim/FGRotation.cpp b/src/FDM/JSBSim/FGRotation.cpp
index 494d9da663e6b8aac80d487fc2123cb111d82fd1..43712681c4a38f4240d252586f6665a011c33e6a 100644 (file)
--- a/src/FDM/JSBSim/FGRotation.cpp
+++ b/src/FDM/JSBSim/FGRotation.cpp
@@ -66,6 +66,12 @@ INCLUDES
 #include "FGAuxiliary.h"
 #include "FGOutput.h"
 
+#ifndef M_PI
+/* get a definition for pi */
+#include <Include/fg_constants.h>
+#define M_PI FG_PI
+#endif
+
 /*******************************************************************************
 ************************************ CODE **************************************
 *******************************************************************************/

diff --git a/src/FDM/JSBSim/FGUtility.cpp b/src/FDM/JSBSim/FGUtility.cpp
index 4d18883dbca31ba9400f6ab00531a1cd8ffdb185..0d672d56d808a9af4b2c4f24fa4272f842575bf3 100644 (file)
--- a/src/FDM/JSBSim/FGUtility.cpp
+++ b/src/FDM/JSBSim/FGUtility.cpp
@@ -57,6 +57,12 @@ INCLUDES
 #include "FGState.h"
 #include "FGFDMExec.h"
 
+#ifndef M_PI
+/* get a definition for pi */
+#include <Include/fg_constants.h>
+#define M_PI FG_PI
+#endif
+
 /*******************************************************************************
 ************************************ CODE **************************************
 *******************************************************************************/