5 files changed, 16 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)
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index 71a1a480b..edf1ba4eb 100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -1,6 +1,8 @@
 @echo off
 if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe
 
+if "%1"=="nox86" goto skipx86
+
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcp100.dll"
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll"
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcp100d.dll"
@@ -14,6 +16,9 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
   "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi
 )
 
+:skipx86
+if "%1"=="nox64" goto skipx64
+
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcp100.dll"
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcr100.dll"
 copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcp100d.dll"
@@ -27,6 +32,8 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
   "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi
 )
 
+:skipx64
+
 del msvcr100.dll
 del msvcr100d.dll
 del msvcp100.dll