equal
deleted
inserted
replaced
26 # or other dealings in this Software without prior written authorization |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 |
29 |
30 diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c |
30 diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c |
31 --- os/utils.c 2008-09-23 11:25:01.000000000 -0700 |
31 --- os/utils.c 2009-01-09 09:47:04.000000000 -0800 |
32 +++ os/utils.c 2008-09-24 20:18:58.790366000 -0700 |
32 +++ os/utils.c 2009-01-22 20:33:34.957491000 -0800 |
33 @@ -606,9 +606,11 @@ void UseMsg(void) |
33 @@ -506,9 +506,11 @@ void UseMsg(void) |
34 #ifdef RLIMIT_STACK |
34 #ifdef RLIMIT_STACK |
35 ErrorF("-ls int limit stack space to N Kb\n"); |
35 ErrorF("-ls int limit stack space to N Kb\n"); |
36 #endif |
36 #endif |
37 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
37 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
38 #ifdef SERVER_LOCK |
38 #ifdef SERVER_LOCK |
40 #endif |
40 #endif |
41 +#endif |
41 +#endif |
42 #ifndef NOLOGOHACK |
42 #ifndef NOLOGOHACK |
43 ErrorF("-logo enable logo in screen saver\n"); |
43 ErrorF("-logo enable logo in screen saver\n"); |
44 ErrorF("nologo disable logo in screen saver\n"); |
44 ErrorF("nologo disable logo in screen saver\n"); |
45 @@ -888,6 +890,7 @@ ProcessCommandLine(int argc, char *argv[ |
45 @@ -761,6 +763,7 @@ ProcessCommandLine(int argc, char *argv[ |
46 UseMsg(); |
46 UseMsg(); |
47 } |
47 } |
48 #endif |
48 #endif |
49 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
49 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
50 #ifdef SERVER_LOCK |
50 #ifdef SERVER_LOCK |
51 else if ( strcmp ( argv[i], "-nolock") == 0) |
51 else if ( strcmp ( argv[i], "-nolock") == 0) |
52 { |
52 { |
53 @@ -899,6 +902,7 @@ ProcessCommandLine(int argc, char *argv[ |
53 @@ -772,6 +775,7 @@ ProcessCommandLine(int argc, char *argv[ |
54 nolock = TRUE; |
54 nolock = TRUE; |
55 } |
55 } |
56 #endif |
56 #endif |
57 +#endif |
57 +#endif |
58 #ifndef NOLOGOHACK |
58 #ifndef NOLOGOHACK |