diff options
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 5 | ||||
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 4 | ||||
| -rw-r--r-- | xorg-server/xkb/xkbInit.c | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index e4f8aff03..d2c6e27b7 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -70,7 +70,7 @@ extern int g_iLastScreen; extern char * g_pszCommandLine; extern Bool g_fSilentFatalError; -extern char * g_pszLogFile; +extern const char * g_pszLogFile; extern Bool g_fLogFileChanged; extern int g_iLogVerbose; Bool g_fLogInited; @@ -185,9 +185,6 @@ winClipboardShutdown (void) /* Wait for the clipboard thread to exit */ pthread_join (g_ptClipboardProc, NULL); - g_fClipboardLaunched = FALSE; - g_fClipboardStarted = FALSE; - winDebug ("winClipboardShutdown - Clipboard thread has exited.\n"); } } diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index d43755e06..03bf1fb03 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -293,8 +293,8 @@ extern int XkbReqCode; extern int XkbEventBase; extern int XkbDisableLockActions; extern int XkbKeyboardErrorCode; -extern char * XkbBaseDirectory; -extern char * XkbBinDirectory; +extern const char * XkbBaseDirectory; +extern const char * XkbBinDirectory; extern char * XkbInitialMap; extern unsigned int XkbXIUnsupported; diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c index b435c425e..a2993b6cd 100644 --- a/xorg-server/xkb/xkbInit.c +++ b/xorg-server/xkb/xkbInit.c @@ -114,8 +114,8 @@ typedef struct _SrvXkmInfo { #define XKB_DFLT_RULES_PROP True #endif -char * XkbBaseDirectory= XKB_BASE_DIRECTORY; -char * XkbBinDirectory= XKB_BIN_DIRECTORY; +const char * XkbBaseDirectory= XKB_BASE_DIRECTORY; +const char * XkbBinDirectory= XKB_BIN_DIRECTORY; static int XkbWantAccessX= 0; static Bool rulesDefined= False; |