Fix build for windows after logstream changes

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index fa4488c420fcbde614d85ccdd53dff7575c7fe9b..a68ce578a7e595ba11c34afc4c9989e0db95df80 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -30,6 +30,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <fstream>

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 399f835407ccca7dd2db9561d4d13f38ffd4011e..4eff67b5b551b7005927a0879b8d95d0c835b570 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -125,7 +125,6 @@ int main ( int argc, char **argv );
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                              LPSTR lpCmdLine, int nCmdShow) {
 
-  logbuf::has_no_console();
   main( __argc, __argv );
 }
 #endif

diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx
index 43ff26ef34593582385cbb380594d12491f7461d..680ee68bda26f9bddc18e9acb9ca355d7dc1ecac 100644 (file)
--- a/src/Main/locale.cxx
+++ b/src/Main/locale.cxx
@@ -18,6 +18,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 2c98f6369dcd24e5660d7845afa15c1b737a3176..6ae142a75ed123adecc74afaa6bce954b2eaf8a6 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -3,6 +3,10 @@
 #  include "config.h"
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>  // gettimeofday
 #endif
@@ -330,7 +334,7 @@ static naRef f_logprint(naContext c, naRef me, int argc, naRef* args)
     if(naIsNil(s)) continue;
     buf += naStr_data(s);
   }
-  SG_LOG(SG_NASAL, (sgDebugPriority) priority.num, buf);
+  SG_LOG(SG_NASAL, (sgDebugPriority)(int) priority.num, buf);
   return naNum(buf.length());
 }