diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-20 14:43:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-20 14:43:52 +0000 |
| commit | 607c11e20aca5c9f13d5e6ab80153b10c249162b (patch) | |
| tree | 12aef2038fea04305602be4d21175ab9d90ef4b8 /xorg-server/hw | |
| parent | 7ebf5528040a4b4b6a929d89633df1a09addf62b (diff) | |
| download | vcxsrv-607c11e20aca5c9f13d5e6ab80153b10c249162b.tar.gz vcxsrv-607c11e20aca5c9f13d5e6ab80153b10c249162b.tar.bz2 vcxsrv-607c11e20aca5c9f13d5e6ab80153b10c249162b.zip | |
Removed compile warnings.
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xwin/winerror.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winglobals.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winprocarg.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winshaddd.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c index 78ac15117..dacee38f5 100644 --- a/xorg-server/hw/xwin/winerror.c +++ b/xorg-server/hw/xwin/winerror.c @@ -41,7 +41,7 @@ /* References to external symbols */ extern char * g_pszCommandLine; -extern char * g_pszLogFile; +extern const char * g_pszLogFile; extern Bool g_fSilentFatalError; extern Bool g_fSilentDupError; extern Bool g_fLogInited; diff --git a/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c index 27635cf05..768eeb8fa 100644 --- a/xorg-server/hw/xwin/winglobals.c +++ b/xorg-server/hw/xwin/winglobals.c @@ -69,9 +69,9 @@ Bool g_fAuthEnabled = FALSE; HICON g_hIconX = NULL;
HICON g_hSmallIconX = NULL;
#ifndef RELOCATE_PROJECTROOT
-char * g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
+const char * g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
#else
-char * g_pszLogFile = "XWin.log";
+const char * g_pszLogFile = "XWin.log";
Bool g_fLogFileChanged = FALSE;
#endif
int g_iLogVerbose = 2;
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c index 40fb41e8e..6db6ad4a3 100644 --- a/xorg-server/hw/xwin/winprocarg.c +++ b/xorg-server/hw/xwin/winprocarg.c @@ -54,7 +54,7 @@ extern Bool g_fUnicodeClipboard; extern Bool g_fClipboard;
#endif
extern int g_iLogVerbose;
-extern char * g_pszLogFile;
+extern const char * g_pszLogFile;
#ifdef RELOCATE_PROJECTROOT
extern Bool g_fLogFileChanged;
#endif
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c index e1501c6c2..0ef4bd432 100644 --- a/xorg-server/hw/xwin/winshaddd.c +++ b/xorg-server/hw/xwin/winshaddd.c @@ -42,7 +42,7 @@ */ extern HWND g_hDlgExit; -extern char *g_pszLogFile; +extern const char *g_pszLogFile; /* * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly, @@ -628,7 +628,7 @@ winShadowUpdateDD (ScreenPtr pScreen, /* Has our memory pointer changed? */ if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface) { - extern char *g_pszLogFile; + extern const char *g_pszLogFile; ErrorF ("winShadowUpdateDD - Memory location of the shadow " "surface has changed, trying to update the root window " "pixmap header to point to the new address. If you get " |