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 89354c8f3c2313793b8c53795bc0e4ce44848777..734f998c0978fde2e8954ea7bacdad2a1d92225c 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -38,20 +38,14 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
-#include STL_IOSTREAM
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+#include <iostream>
+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" );
@@ -88,25 +82,6 @@ handleFPE (int num)
 }
 #endif
 
-#ifdef __APPLE__
-
-typedef struct
-{
-  int  lo;
-  int  hi;
-} PSN;
-
-extern "C" {
-  short CPSGetCurrentProcess(PSN *psn);
-  short CPSSetProcessName (PSN *psn, char *processname);
-  short CPSEnableForegroundOperation(PSN *psn, int _arg2, int _arg3, int _arg4, int _arg5);
-  short CPSSetFrontProcess(PSN *psn);
-};
-
-#define CPSEnableFG(psn) CPSEnableForegroundOperation(psn,0x03,0x3C,0x2C,0x1103)
-
-#endif
-
 #ifdef _MSC_VER
 int main ( int argc, char **argv );
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
@@ -166,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
 
@@ -194,21 +169,6 @@ int main ( int argc, char **argv ) {
     _control87(MCW_EM, MCW_EM);  /* defined in float.h */
 #endif
 
-    // Keyboard focus hack
-#if defined(__APPLE__) && !defined(OSX_BUNDLE)
-    {
-      PSN psn;
-
-      fgOSInit (&argc, argv);
-      _bootstrap_OSInit++;
-
-      CPSGetCurrentProcess(&psn);
-      CPSSetProcessName(&psn, "FlightGear");
-      CPSEnableFG(&psn);
-      CPSSetFrontProcess(&psn);
-    }
-#endif
-
     // FIXME: add other, more specific
     // exceptions.
     try {