diff options
| author | Keith Packard <keithp@keithp.com> | 2010-02-12 13:36:32 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-02-12 13:36:32 -0800 |
| commit | 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5 (patch) | |
| tree | ee545d8b7c0935f45c0d8c63e5a8542a872d8492 /os | |
| parent | c6d9bc092c84ad5c68083a126aa7577baa42cef7 (diff) | |
| parent | c76248fda99c38aef0ccf0ed6b58fbe95f6fe497 (diff) | |
Merge remote branch 'jturney/master'
Diffstat (limited to 'os')
| -rw-r--r-- | os/utils.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/os/utils.c b/os/utils.c index 71ab6f07a..79399fa53 100644 --- a/os/utils.c +++ b/os/utils.c @@ -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) { |