diff options
Diffstat (limited to 'xorg-server/hw/xwin')
| -rwxr-xr-x | xorg-server/hw/xwin/winclipboard/thread.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winconfig.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winclipboard/thread.c b/xorg-server/hw/xwin/winclipboard/thread.c index 50cf997fb..5dee3040e 100755 --- a/xorg-server/hw/xwin/winclipboard/thread.c +++ b/xorg-server/hw/xwin/winclipboard/thread.c @@ -111,6 +111,7 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay) int iReturn; HWND hwnd = NULL; int iConnectionNumber = 0; + Bool bShutDown = TRUE; #ifdef HAS_DEVWINDOWS int fdMessageQueue = 0; @@ -161,6 +162,7 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay) pDisplay = XOpenDisplay(szDisplay); if (pDisplay == NULL) { ErrorF("winClipboardProc - Failed opening the display, giving up\n"); + bShutDown = FALSE; goto thread_errorexit; } @@ -397,7 +399,7 @@ commonexit: pthread_cleanup_pop(0); - return FALSE; + return bShutDown; } /* diff --git a/xorg-server/hw/xwin/winconfig.h b/xorg-server/hw/xwin/winconfig.h index 798c779a6..f079368c7 100644 --- a/xorg-server/hw/xwin/winconfig.h +++ b/xorg-server/hw/xwin/winconfig.h @@ -57,7 +57,6 @@ typedef struct { Bool active; Bool inUse; int videoRam; - int textClockFreq; void *options; int screen; /* For multi-CRTC cards */ } GDevRec, *GDevPtr; |