Repair '-nolock'
commit 446fe9eecd
removes the AC_DEFINE for
SERVER_LOCK and conditional compilation checking it, making it always on
everywhere, except in os/utils.c where code is left under SERVER_LOCK, which
now never gets built, making the '-nolock' option non-functional...
This seems to have been broken since Xserver 1.7.0, but this option is
actually of some slight use on cygwin, as if /tmp resides on a FAT filesystem
(yes, I know...), hard links aren't supported.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
7f54ccafad
commit
c9cbbd5d1c
|
@ -504,9 +504,7 @@ void UseMsg(void)
|
|||
#ifdef RLIMIT_STACK
|
||||
ErrorF("-ls int limit stack space to N Kb\n");
|
||||
#endif
|
||||
#ifdef SERVER_LOCK
|
||||
ErrorF("-nolock disable the locking mechanism\n");
|
||||
#endif
|
||||
#ifndef NOLOGOHACK
|
||||
ErrorF("-logo enable logo in screen saver\n");
|
||||
ErrorF("nologo disable logo in screen saver\n");
|
||||
|
@ -758,7 +756,6 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
UseMsg();
|
||||
}
|
||||
#endif
|
||||
#ifdef SERVER_LOCK
|
||||
else if ( strcmp ( argv[i], "-nolock") == 0)
|
||||
{
|
||||
#if !defined(WIN32) && !defined(__CYGWIN__)
|
||||
|
@ -768,7 +765,6 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
#endif
|
||||
nolock = TRUE;
|
||||
}
|
||||
#endif
|
||||
#ifndef NOLOGOHACK
|
||||
else if ( strcmp( argv[i], "-logo") == 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user