- Added ultra-light traffic is now a separate traffic class that can have its

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

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 5bfe72297c472a70bdf65b3b7107a8d586a98077..8322b598acd6e82ac9f6b1d8eaa52e59362557a2 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -144,7 +144,7 @@ void flush_fpe(void)
 }
 #endif
 
-static void terminate() {
+static void fg_terminate() {
     cerr << endl <<
             "Uncaught Exception: you should see a meaningful error message\n"
             "here, but your GLUT (or SDL) library was apparently compiled\n"
@@ -215,7 +215,7 @@ int main ( int argc, char **argv ) {
     // FIXME: add other, more specific
     // exceptions.
     try {
-        std::set_terminate(terminate);
+        std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
         fgMainInit(argc, argv);
     } catch (const sg_throwable &t) {