diff options
author | marha <marha@users.sourceforge.net> | 2010-03-10 17:43:23 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-10 17:43:23 +0000 |
commit | 2af2c9f31121e5b8032fd7c501bca8b98b902bb4 (patch) | |
tree | d64edc226c3b119daf344aa3195c77259af83136 /xorg-server/hw/xwin/winglobals.c | |
parent | b597b844d3cde7821fe2328f6a8573114017255c (diff) | |
parent | c394f19a54ed3cc959a47cdde6dbb53f31a9fa87 (diff) | |
download | vcxsrv-2af2c9f31121e5b8032fd7c501bca8b98b902bb4.tar.gz vcxsrv-2af2c9f31121e5b8032fd7c501bca8b98b902bb4.tar.bz2 vcxsrv-2af2c9f31121e5b8032fd7c501bca8b98b902bb4.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winglobals.c')
-rw-r--r-- | xorg-server/hw/xwin/winglobals.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c index 768eeb8fa..ce9c8aba4 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
-const char * g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
+const char * g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
#else
-const char * g_pszLogFile = "XWin.log";
+const char * g_pszLogFile = "XWin.log";
Bool g_fLogFileChanged = FALSE;
#endif
int g_iLogVerbose = 2;
|