diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-06-20 21:18:52 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-06-20 21:18:52 +0100 |
| commit | 4f0fbb7414e8e3c26d9a0a21421ff90cf841cbb3 (patch) | |
| tree | 8c5b08b3754e17933f1c64b6614c13ba2fd888cd /hw/xwin/winglobals.c | |
| parent | 6c4ea309427b9cd95a72185a84aee569a0a673ab (diff) | |
| parent | deed8fb257d2d73d22941dd5bbdd4bab3ef1d3f8 (diff) | |
Merge branch 'clipboard-64bit-fix' into cygwin-release-1.14xserver-cygwin-1.14.1-2
Diffstat (limited to 'hw/xwin/winglobals.c')
| -rw-r--r-- | hw/xwin/winglobals.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index fd6c1b490..ad82b83f6 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -86,8 +86,6 @@ pthread_mutex_t g_pmTerminating = PTHREAD_MUTEX_INITIALIZER; * Wrapped DIX functions */ winDispatchProcPtr winProcEstablishConnectionOrig = NULL; -winDispatchProcPtr winProcQueryTreeOrig = NULL; -winDispatchProcPtr winProcSetSelectionOwnerOrig = NULL; /* * Clipboard variables @@ -95,13 +93,7 @@ winDispatchProcPtr winProcSetSelectionOwnerOrig = NULL; Bool g_fUnicodeClipboard = TRUE; Bool g_fClipboard = TRUE; -Bool g_fClipboardLaunched = FALSE; Bool g_fClipboardStarted = FALSE; -pthread_t g_ptClipboardProc; -HWND g_hwndClipboard = NULL; -void *g_pClipboardDisplay = NULL; -Window g_iClipboardWindow = None; -Atom g_atomLastOwnedSelection = None; #endif /* @@ -113,10 +105,4 @@ void winInitializeGlobals(void) { g_dwCurrentThreadID = GetCurrentThreadId(); -#ifdef XWIN_CLIPBOARD - g_iClipboardWindow = None; - g_pClipboardDisplay = NULL; - g_atomLastOwnedSelection = None; - g_hwndClipboard = NULL; -#endif } |