16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c |
21 diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c |
22 --- os/utils.c 2009-09-07 23:04:53.000000000 -0700 |
22 diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c |
23 +++ os/utils.c 2009-11-03 22:28:49.970963082 -0800 |
23 --- os/utils.c 2011-01-07 06:26:45.000000000 -0800 |
24 @@ -504,9 +504,11 @@ void UseMsg(void) |
24 +++ os/utils.c 2011-02-15 15:53:10.744333673 -0800 |
|
25 @@ -509,7 +509,9 @@ void UseMsg(void) |
25 #ifdef RLIMIT_STACK |
26 #ifdef RLIMIT_STACK |
26 ErrorF("-ls int limit stack space to N Kb\n"); |
27 ErrorF("-ls int limit stack space to N Kb\n"); |
27 #endif |
28 #endif |
28 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
29 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
29 #ifdef SERVER_LOCK |
|
30 ErrorF("-nolock disable the locking mechanism\n"); |
30 ErrorF("-nolock disable the locking mechanism\n"); |
31 #endif |
|
32 +#endif |
31 +#endif |
33 #ifndef NOLOGOHACK |
32 #ifndef NOLOGOHACK |
34 ErrorF("-logo enable logo in screen saver\n"); |
33 ErrorF("-logo enable logo in screen saver\n"); |
35 ErrorF("nologo disable logo in screen saver\n"); |
34 ErrorF("nologo disable logo in screen saver\n"); |
36 @@ -758,6 +760,7 @@ ProcessCommandLine(int argc, char *argv[ |
35 @@ -759,6 +761,7 @@ ProcessCommandLine(int argc, char *argv[ |
37 UseMsg(); |
36 UseMsg(); |
38 } |
37 } |
39 #endif |
38 #endif |
40 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
39 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */ |
41 #ifdef SERVER_LOCK |
|
42 else if ( strcmp ( argv[i], "-nolock") == 0) |
40 else if ( strcmp ( argv[i], "-nolock") == 0) |
43 { |
41 { |
44 @@ -769,6 +772,7 @@ ProcessCommandLine(int argc, char *argv[ |
42 #if !defined(WIN32) && !defined(__CYGWIN__) |
|
43 @@ -768,6 +771,7 @@ ProcessCommandLine(int argc, char *argv[ |
|
44 #endif |
45 nolock = TRUE; |
45 nolock = TRUE; |
46 } |
46 } |
47 #endif |
|
48 +#endif |
47 +#endif |
49 #ifndef NOLOGOHACK |
48 #ifndef NOLOGOHACK |
50 else if ( strcmp( argv[i], "-logo") == 0) |
49 else if ( strcmp( argv[i], "-logo") == 0) |
51 { |
50 { |