Various MSVC patches.

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index a8413cc9b075e719aaa0c635e17db0975b539e7e..14810b4019d7108232441ec82b9228469cbf38a8 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -48,9 +48,12 @@
 #define WIN_W 1024
 #define WIN_H 768
 
-#ifdef NONE
-#pragma warn A sloppy coder has defined NONE as a macro!!!
-#undef NONE
+#ifdef defined( NONE ) && defined( _MSC_VER )
+#  pragma message( "A sloppy coder has defined NONE as a macro!!!" )
+#  undef NONE
+#elif defined( NONE )
+#  pragma warn A sloppy coder has defined NONE as a macro!!!
+#  undef NONE
 #endif
 
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2a0802dda26c1153d9023ab0bf0e440859ca3b9d..0a841f6da82c6096b630f7c5f6529865885b4ade 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1515,10 +1515,6 @@ int mainLoop( int argc, char **argv ) {
     argc = ccommand( &argv );
 #endif
 
-#ifdef HAVE_BC5PLUS
-    _control87(MCW_EM, MCW_EM);  /* defined in float.h */
-#endif
-
     // set default log levels
     sglog().setLogLevels( SG_ALL, SG_INFO );
 
@@ -1859,11 +1855,15 @@ int mainLoop( int argc, char **argv ) {
 // Main entry point; catch any exceptions that have made it this far.
 int main ( int argc, char **argv ) {
 
-#ifdef _MSC_VER
+#if defined( _MSC_VER ) && defined( DEBUG )
     // Christian, we should document what this does
     _control87( _EM_INEXACT, _MCW_EM );
 #endif
 
+#if defined( HAVE_BC5PLUS )
+    _control87(MCW_EM, MCW_EM);  /* defined in float.h */
+#endif
+
     // FIXME: add other, more specific
     // exceptions.
     try {

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index 6fb4029215eb975636de472a3558c1e9e7fd8778..b55cf8dec28739b46e07332b335e21e30f10a109 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -342,6 +342,8 @@ void *fgBillboard( ssgBranch *lightmaps, ssgVertexArray *light_maps, ssgSimpleSt
         leaf->setState( lightmap_state );
         lightmaps->addKid( leaf );
     }
+
+    return NULL;
 }
 
 ssgBranch* FGTileEntry::gen_runway_lights( ssgVertexArray *points,ssgVertexArray *normal,