frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Jon TURNEY 2009-11-28 17:51:33 +00:00
parent 7f54ccafad
commit c9cbbd5d1c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/utils.c
View File

@ -504,9 +504,7 @@ void UseMsg(void)
#ifdef RLIMIT_STACK #ifdef RLIMIT_STACK
ErrorF("-ls int limit stack space to N Kb\n"); ErrorF("-ls int limit stack space to N Kb\n");
#endif #endif
#ifdef SERVER_LOCK
ErrorF("-nolock disable the locking mechanism\n"); ErrorF("-nolock disable the locking mechanism\n");
#endif
#ifndef NOLOGOHACK #ifndef NOLOGOHACK
ErrorF("-logo enable logo in screen saver\n"); ErrorF("-logo enable logo in screen saver\n");
ErrorF("nologo disable logo in screen saver\n"); ErrorF("nologo disable logo in screen saver\n");
@ -758,7 +756,6 @@ ProcessCommandLine(int argc, char *argv[])
UseMsg(); UseMsg();
} }
#endif #endif
#ifdef SERVER_LOCK
else if ( strcmp ( argv[i], "-nolock") == 0) else if ( strcmp ( argv[i], "-nolock") == 0)
{ {
#if !defined(WIN32) && !defined(__CYGWIN__) #if !defined(WIN32) && !defined(__CYGWIN__)
@ -768,7 +765,6 @@ ProcessCommandLine(int argc, char *argv[])
#endif #endif
nolock = TRUE; nolock = TRUE;
} }
#endif
#ifndef NOLOGOHACK #ifndef NOLOGOHACK
else if ( strcmp( argv[i], "-logo") == 0) else if ( strcmp( argv[i], "-logo") == 0)
{ {