Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 9e4a57513f4ddacac5c668b80f636704723d43ae..734f998c0978fde2e8954ea7bacdad2a1d92225c 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -39,19 +39,13 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <iostream>
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+using std::cerr;
+using std::endl;
 
 #include "main.hxx"
 #include "globals.hxx"
 
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#  include <pthread.h>
-#endif
-
 #include "fg_os.hxx"
 
 char *homedir = ::getenv( "HOME" );
@@ -147,7 +141,7 @@ int main ( int argc, char **argv ) {
     // Ignore floating-point exceptions on FreeBSD
     signal(SIGFPE, SIG_IGN);
 #endif
-#ifndef _MSC_VER
+#if !defined( _MSC_VER ) && !defined( __MINGW32__ )
     signal(SIGPIPE, SIG_IGN);
 #endif