From: hooray Date: Mon, 4 Feb 2013 16:35:39 +0000 (+0100) Subject: fg mingw fixes part #1 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7fa1b9062e91ca15dac6feded38d680371e5af5f;p=flightgear.git fg mingw fixes part #1 Conflicts: src/Main/bootstrap.cxx --- diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx index a4425c76a..f305b345b 100644 --- a/src/Main/bootstrap.cxx +++ b/src/Main/bootstrap.cxx @@ -120,7 +120,7 @@ static void initFPE() } #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(_WIN32) int main ( int argc, char **argv ); int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { @@ -165,7 +165,7 @@ int _bootstrap_OSInit; // Main entry point; catch any exceptions that have made it this far. int main ( int argc, char **argv ) { -#if _MSC_VER +#if defined(_MSC_VER) || defined(_WIN32) // Don't show blocking "no disk in drive" error messages on Windows 7, // silently return errors to application instead. // See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX"