diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-08-27 01:22:46 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:31 +0200 |
commit | 385dc2b070df1e19853a009bfe32204e0c5b2dd7 (patch) | |
tree | 6c18a91191560417fe9ae67ea10ca5905bc29fb2 /nx-X11/lib/X11/lcInit.c | |
parent | e868fbbfdabe9cf45899054c8455d39acf800ede (diff) | |
download | nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.gz nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.bz2 nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.zip |
update xlibi18n files to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/lcInit.c')
-rw-r--r-- | nx-X11/lib/X11/lcInit.c | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/nx-X11/lib/X11/lcInit.c b/nx-X11/lib/X11/lcInit.c index fb9fde9f4..ee66b8c92 100644 --- a/nx-X11/lib/X11/lcInit.c +++ b/nx-X11/lib/X11/lcInit.c @@ -1,8 +1,6 @@ /* Copyright 1985, 1986, 1987, 1991, 1998 The Open Group -Portions Copyright 2000 Sun Microsystems, Inc. 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 @@ -14,21 +12,18 @@ permission notice 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 OPEN GROUP OR SUN MICROSYSTEMS, INC. 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 EVEN IF -ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES. +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 +OPEN GROUP 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 +EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES. -Except as contained in this notice, the names of The Open Group and/or -Sun Microsystems, Inc. shall not be used in advertising or otherwise to -promote the sale, use or other dealings in this Software without prior -written authorization from The Open Group and/or Sun Microsystems, -Inc., as applicable. +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. X Window System is a trademark of The Open Group @@ -42,6 +37,29 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* + * Copyright 2000 Sun Microsystems, Inc. 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. + */ + +/* * Copyright 1992, 1993 by TOSHIBA Corp. * * Permission to use, copy, modify, and distribute this software and its @@ -70,7 +88,7 @@ Sun Microsystems, Inc. or its licensors is granted. * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. * - * Modifier: Masayoshi Shimamura FUJITSU LIMITED + * Modifier: Masayoshi Shimamura FUJITSU LIMITED * */ @@ -101,7 +119,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ void -_XlcInitLoader() +_XlcInitLoader(void) { #ifdef USE_DYNAMIC_LC @@ -140,7 +158,7 @@ _XlcInitLoader() } void -_XlcDeInitLoader() +_XlcDeInitLoader(void) { #ifdef USE_DYNAMIC_LC |