diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 10:18:29 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 10:18:29 +0200 |
| commit | 1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098 (patch) | |
| tree | ba5db1140fce588ecd5d04d702e35b5da53e93a3 /xorg-server/hw/xwin | |
| parent | af62a89a4e677bc0a10094be86816b2e273b2c4a (diff) | |
| download | vcxsrv-1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098.tar.gz vcxsrv-1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098.tar.bz2 vcxsrv-1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098.zip | |
Solved compilation problems due to latest merge
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winglobals.h | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winmsgwindow.c | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xdmcphostselect.c | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index c45de8331..18d0aa2f8 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -259,9 +259,11 @@ ddxGiveUp(enum ExitCode error) PostQuitMessage(0); { + int iReturn; + winDebug("ddxGiveUp - Releasing termination mutex\n"); - int iReturn = pthread_mutex_unlock(&g_pmTerminating); + iReturn = pthread_mutex_unlock(&g_pmTerminating); if (iReturn != 0) { ErrorF("winMsgWindowProc - pthread_mutex_unlock () failed: %d\n", diff --git a/xorg-server/hw/xwin/winglobals.h b/xorg-server/hw/xwin/winglobals.h index 81ceca31c..75707b460 100644 --- a/xorg-server/hw/xwin/winglobals.h +++ b/xorg-server/hw/xwin/winglobals.h @@ -30,6 +30,8 @@ #include <xwin-config.h> #endif +#include <pthread.h> + /* * References to external symbols */ diff --git a/xorg-server/hw/xwin/winmsgwindow.c b/xorg-server/hw/xwin/winmsgwindow.c index 8067c693c..e48a46af7 100644 --- a/xorg-server/hw/xwin/winmsgwindow.c +++ b/xorg-server/hw/xwin/winmsgwindow.c @@ -22,6 +22,9 @@ * */ +#ifdef HAVE_XWIN_CONFIG_H +#include <xwin-config.h> +#endif #include "win.h" /* diff --git a/xorg-server/hw/xwin/xdmcphostselect.c b/xorg-server/hw/xwin/xdmcphostselect.c index 9c3ca797b..9b8b62b93 100644 --- a/xorg-server/hw/xwin/xdmcphostselect.c +++ b/xorg-server/hw/xwin/xdmcphostselect.c @@ -44,7 +44,7 @@ static void SelectHost(int Index) * Process messages for the about dialog.
*/
-static wBOOL CALLBACK DisplayXdmcpHostsDlgProc (HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DisplayXdmcpHostsDlgProc (HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
{
/* Branch on message type */
switch (message)
|