diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
| commit | 59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch) | |
| tree | a797879cc0fe54172dba50354b635b1f595081db /xorg-server/hw/xwin/winclipboardthread.c | |
| parent | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff) | |
| parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
| download | vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2 vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winkeynames.h
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardthread.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardthread.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c index c160453c8..758bbd32d 100644 --- a/xorg-server/hw/xwin/winclipboardthread.c +++ b/xorg-server/hw/xwin/winclipboardthread.c @@ -53,8 +53,8 @@ extern Bool g_fUnicodeClipboard; extern unsigned long serverGeneration; -extern Bool g_fClipboardLaunched; extern Bool g_fClipboardStarted; +extern Bool g_fClipboardLaunched; extern HWND g_hwndClipboard; extern void *g_pClipboardDisplay; extern Window g_iClipboardWindow; @@ -85,7 +85,6 @@ winClipboardIOErrorHandler (Display *pDisplay); static void winClipboardThreadExit(void *arg); - /* * Main thread function */ @@ -151,7 +150,6 @@ winClipboardProc (void *pvNotUsed) { /* TODO: Cleanup the Win32 window and free any allocated memory */ ErrorF ("winClipboardProc - setjmp returned for IO Error Handler.\n"); - //goto thread_errorexit; } /* Use our generated cookie for authentication */ |