MSVC++ and FreeBSD portability tweaks.

diff --git a/Simulator/Cockpit/hud.hxx b/Simulator/Cockpit/hud.hxx
index 079139e29a06116b10af2c136b06caa9ca57aaf8..7ea442e15edaa442b1081bd4c9cdd8a9e882769b 100644 (file)
--- a/Simulator/Cockpit/hud.hxx
+++ b/Simulator/Cockpit/hud.hxx
@@ -57,6 +57,7 @@
 
 FG_USING_STD(deque);
 FG_USING_STD(vector);
+FG_USING_NAMESPACE(std);
 
 #ifndef WIN32
   typedef struct {

diff --git a/Simulator/GUI/gui.cxx b/Simulator/GUI/gui.cxx
index 7bbd73b819b5ec95627ce584cdf716cb9cc79843..7e2e8e6cec38de7835e8f01a661a003737d9aefd 100644 (file)
--- a/Simulator/GUI/gui.cxx
+++ b/Simulator/GUI/gui.cxx
@@ -64,6 +64,10 @@
 
 FG_USING_STD(string);
 
+#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
+FG_USING_STD(cout);
+#endif
+
 puFont guiFnt = 0;
 fntTexFont *guiFntHandle = 0;
 
@@ -595,7 +599,7 @@ void guiInit()
     // Install our fast fonts
     fntpath.append( "typewriter.txf" );
     guiFntHandle = new fntTexFont ;
-    guiFntHandle -> load ( fntpath.c_str() ) ;
+    guiFntHandle -> load ( (char *)fntpath.c_str() ) ;
     puFont GuiFont ( guiFntHandle, 15 ) ;
     puSetDefaultFonts( GuiFont, GuiFont ) ;
     guiFnt = puGetDefaultLabelFont();

diff --git a/Simulator/Main/splash.cxx b/Simulator/Main/splash.cxx
index 7f07e291841def0dd1cf89f8498d8442d1ff8f26..d69e30b5c758bef4758d5ac29ad23929cd6f90b4 100644 (file)
--- a/Simulator/Main/splash.cxx
+++ b/Simulator/Main/splash.cxx
@@ -109,6 +109,10 @@ void fgSplashUpdate ( double progress ) {
     int xsize = 480;
     int ysize = 380;
 
+    if ( !current_view.get_winWidth() || !current_view.get_winHeight() ) {
+       return;
+    }
+
     xmin = (current_view.get_winWidth() - xsize) / 2;
     xmax = xmin + xsize;
 

diff --git a/Tools/Construct/Parallel/client.cxx b/Tools/Construct/Parallel/client.cxx
index 9115b91e54b72ba6e420981d2f25c45bac75f3e7..2138b971ed57cee0965d404602a32d6320555e14 100644 (file)
--- a/Tools/Construct/Parallel/client.cxx
+++ b/Tools/Construct/Parallel/client.cxx
@@ -2,6 +2,14 @@
 /*               -- for CSci 5502 */
 
 
+#ifdef HAVE_CONFIG_H
+#  include <Include/config.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>       // BSD macro definitions
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -45,7 +53,7 @@ void check_master_switch() {
 
 // check if the host system is free of interactive users
 int system_free() {
-#ifndef __FreeBSD__
+#ifndef BSD
     struct utmp *uptr;
 
     setutent();