aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-01 09:26:30 +0200
committermarha <marha@users.sourceforge.net>2011-08-01 09:26:30 +0200
commit30aa3aea81afd082cba94028183ac9d5c7c1e123 (patch)
tree8719c668e19e2d0c4d30fdafb63c3933ffa1198d
parentd80ce197266a28cf85621d01a3d57606e40df87a (diff)
downloadvcxsrv-30aa3aea81afd082cba94028183ac9d5c7c1e123.tar.gz
vcxsrv-30aa3aea81afd082cba94028183ac9d5c7c1e123.tar.bz2
vcxsrv-30aa3aea81afd082cba94028183ac9d5c7c1e123.zip
Solved compile problems: AbrtDDX now has the exit code as parameter
-rw-r--r--xorg-server/hw/xwin/winclipboardthread.c2
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwm.c2
-rw-r--r--xorg-server/hw/xwin/xdmcphostselect.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index b3ffff689..6a076a4d3 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -520,6 +520,6 @@ static void
winClipboardThreadExit(void *arg)
{
/* clipboard thread has exited, stop server as well */
- AbortDDX();
+ AbortDDX(EXIT_ERR_ABORT);
TerminateProcess(GetCurrentProcess(),1);
}
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 015192070..16db73c91 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -1464,7 +1464,7 @@ winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
static void
winMultiWindowThreadExit(void *arg)
{
- AbortDDX();
+ AbortDDX(EXIT_ERR_ABORT);
/* multiwindow client thread has exited, stop server as well */
TerminateProcess(GetCurrentProcess(),1);
diff --git a/xorg-server/hw/xwin/xdmcphostselect.c b/xorg-server/hw/xwin/xdmcphostselect.c
index c58463fe7..9c3ca797b 100644
--- a/xorg-server/hw/xwin/xdmcphostselect.c
+++ b/xorg-server/hw/xwin/xdmcphostselect.c
@@ -98,7 +98,7 @@ static wBOOL CALLBACK DisplayXdmcpHostsDlgProc (HWND hwndDialog, UINT message, W
winDebug ("DisplayXdmcpHostsDlgProc - WM_COMMAND - IDCANCEL\n");
DestroyWindow (g_hDlgHosts);
- AbortDDX();
+ AbortDDX(EXIT_ERR_ABORT);
TerminateProcess(GetCurrentProcess(),1); /* Exit the application */
return TRUE;
@@ -119,7 +119,7 @@ static wBOOL CALLBACK DisplayXdmcpHostsDlgProc (HWND hwndDialog, UINT message, W
DestroyWindow (g_hDlgHosts);
g_hDlgHosts = NULL;
- AbortDDX();
+ AbortDDX(EXIT_ERR_ABORT);
TerminateProcess(GetCurrentProcess(),1); /* Exit the application */
return TRUE;