- Removed waiting until clipboard was started after being launched in

  function winProcSetSelectionOwner. (This was causing a dead lock)
- Changed welcome message
- Synchronised winclipboardxevents with the version on the release branch
  (Removed calls to XLockDisplay and XUnlockDisplay)
- Call to XInitThreads has been moved to the beginning of dix\main. This
  function should be called before any call to a Xlib function.

1 files changed, 1 insertions, 8 deletions

diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index b459e81c0..7912506e5 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -43,7 +43,6 @@
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
-#define max __max
 #endif
 
 /*
@@ -126,13 +125,6 @@ winClipboardProc (void *pvNotUsed)
   /* Save the Unicode support flag in a global */
   g_fUseUnicode = fUseUnicode;
 
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winClipboardProc - XInitThreads failed.\n");
-      goto thread_errorexit;
-    }
-
   /* See if X supports the current locale */
   if (XSupportsLocale () == False)
     {
@@ -315,6 +307,7 @@ winClipboardProc (void *pvNotUsed)
     goto thread_errorexit;
   }
 
+  ErrorF ("winClipboardProc - Started\n");
   /* Signal that the clipboard client has started */
   g_fClipboardStarted = TRUE;