Fix bug #5525: Windows XP doesn't shut down with LyX open

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33077 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/client/client.cpp b/src/client/client.cpp
index f92a1f65b36458f417b0a6cd25590007659aa131..c75c6ecadd9c8e7e624d7606b55ed1650e17f743 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -66,7 +66,7 @@ using ::boost::scoped_ptr;
 namespace lyx {
 
 // Keep the linker happy on Windows
-void emergencyCleanup()
+void lyx_exit(int)
 {}
 
 namespace support {

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index 2f6b9b4b5740ae79a88746afaf6b37fb7d5a47ca..6c5c91dd1ba91839857f71e0f90da328e22cb036 100644 (file)
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -38,7 +38,7 @@ using namespace std;
 
 namespace lyx {
 
-void emergencyCleanup();
+void lyx_exit(int);
 
 namespace support {
 namespace os {
@@ -194,7 +194,7 @@ BOOL terminate_handler(DWORD event)
        if (event == CTRL_CLOSE_EVENT
            || event == CTRL_LOGOFF_EVENT
            || event == CTRL_SHUTDOWN_EVENT) {
-               lyx::emergencyCleanup();
+               lyx::lyx_exit(1);
                return TRUE;
        }
        return FALSE;

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index d3ec20dffd42b6ddb624a63b5efeb335ff446a51..19d28d7e4bb766951372002e4cd5f702584bd9ec 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -72,7 +72,7 @@ using namespace std;
 
 namespace lyx {
 
-void emergencyCleanup();
+void lyx_exit(int);
 
 namespace support {
 namespace os {
@@ -88,7 +88,7 @@ BOOL terminate_handler(DWORD event)
        if (event == CTRL_CLOSE_EVENT
            || event == CTRL_LOGOFF_EVENT
            || event == CTRL_SHUTDOWN_EVENT) {
-               lyx::emergencyCleanup();
+               lyx::lyx_exit(1);
                return TRUE;
        }
        return FALSE;

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index d2aad9ed88ef6088ebf9d42de6a9ac9a19935725..90a20248a4104bd34c79c8e553990d1e382f3d1d 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -57,7 +57,7 @@ Messages & getGuiMessages()
 
 
 // Keep the linker happy on Windows
-void emergencyCleanup()
+void lyx_exit(int)
 {}