MSVC fixes.

diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index 64a6d906f6dcaf57ee378d5261e5c81b3ef3dbf5..2c3fde7467ba848c9e9039e281444b1d06dc94c3 100644 (file)
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -26,7 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include <fg_props.hxx>
+#include "fg_props.hxx"
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx
index e8262f02199cc398958ace2171da48f15fbaabe8..e40b7916a1bcda349bcbc0773928fcfeabc76a78 100644 (file)
--- a/src/Network/net_fdm.hxx
+++ b/src/Network/net_fdm.hxx
@@ -48,9 +48,11 @@ public:
                                 // SPARC, which don't like misaligned
                                 // data
 
-    static const int FG_MAX_ENGINES = 4;
-    static const int FG_MAX_WHEELS = 3;
-    static const int FG_MAX_TANKS = 2;
+    enum {
+        FG_MAX_ENGINES = 4,
+        FG_MAX_WHEELS = 3,
+        FG_MAX_TANKS = 2
+    };
 
     // Positions
     double longitude;          // geodetic (radians)

diff --git a/src/Network/raw_ctrls.hxx b/src/Network/raw_ctrls.hxx
index e39591a101a7ce8e9ad6cbcd756188fa756ca319..4f1688c5c3e8905713b0a988f84fdff34d5fb3cc 100644 (file)
--- a/src/Network/raw_ctrls.hxx
+++ b/src/Network/raw_ctrls.hxx
@@ -41,8 +41,10 @@ public:
 
     int version;                        // increment when data values change
 
-    static const int FG_MAX_ENGINES = 4;
-    static const int FG_MAX_WHEELS = 3;
+    enum {
+        FG_MAX_ENGINES = 4,
+        FG_MAX_WHEELS = 3
+    };
 
     // Aero controls
     double aileron;                     // -1 ... 1