Miscellaneous MSVC fixes.

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index d0e3fd588ef37b6d55aa1b1f2012045baa0e53dc..2de3535dc88218703a9cc3aa92a1878906eb63f7 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -51,10 +51,14 @@
 #include STL_STRING
 #include <set>
 
-#define NDEBUG                 // she don't work without it.
+#ifndef _MSC_VER
+#   define NDEBUG                      // she don't work without it.
+#endif
 #include <mk4.h>
 #include <mk4str.h>
-#undef NDEBUG
+#ifndef _MSC_VER
+#  undef NDEBUG
+#endif
 
 FG_USING_STD(string);
 FG_USING_STD(set);

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 51274c04228d08651f45e2faef681c55fdf95342..8734b1e9c09c6b9c0d9f223a76a7d9f6ab9431de 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -49,7 +49,7 @@
 
 #include <simgear/constants.h>
 
-#include <fg_typedefs.h>
+#include <Include/fg_typedefs.h>
 #include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>
 #include <Controls/controls.hxx>