# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c

diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c

--- os/utils.c 2011-01-07 06:26:45.000000000 -0800

+++ os/utils.c 2011-02-15 15:53:10.744333673 -0800

@@ -509,7 +509,9 @@ void UseMsg(void)

#ifdef RLIMIT_STACK

ErrorF("-ls int limit stack space to N Kb\n");

#endif

+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

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");

@@ -759,6 +761,7 @@ ProcessCommandLine(int argc, char *argv[

UseMsg();

}

#endif

+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

else if ( strcmp ( argv[i], "-nolock") == 0)

{

#if !defined(WIN32) && !defined(__CYGWIN__)

@@ -768,6 +771,7 @@ ProcessCommandLine(int argc, char *argv[

#endif

nolock = TRUE;

}

+#endif

#ifndef NOLOGOHACK

else if ( strcmp( argv[i], "-logo") == 0)

{