svn merge ^/branches/released .

1 files changed, 73 insertions, 76 deletions

diff --git a/libXmu/src/sharedlib.c b/libXmu/src/sharedlib.c
index 0ef5e3ce9..37363d7f6 100644
--- a/libXmu/src/sharedlib.c
+++ b/libXmu/src/sharedlib.c
@@ -1,76 +1,73 @@
-/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this 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 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.
-
-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.
-
-*/
-/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */
-
-#if defined(SUNSHLIB) && !defined(SHAREDCODE)
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Atoms.h"
-
-struct _AtomRec {
-    char *name;
-    struct _DisplayRec* head;
-};
-
-#if !defined(UNIXCPP) || defined(ANSICPP)
-#define DeclareAtom(atom) \
-extern struct _AtomRec __##atom; \
-AtomPtr _##atom = &__##atom;
-#else
-#define DeclareAtom(atom) \
-extern struct _AtomRec __/**/atom; \
-AtomPtr _/**/atom = &__/**/atom;
-#endif
-
-DeclareAtom(XA_ATOM_PAIR)
-DeclareAtom(XA_CHARACTER_POSITION)
-DeclareAtom(XA_CLASS)
-DeclareAtom(XA_CLIENT_WINDOW)
-DeclareAtom(XA_CLIPBOARD)
-DeclareAtom(XA_COMPOUND_TEXT)
-DeclareAtom(XA_DECNET_ADDRESS)
-DeclareAtom(XA_DELETE)
-DeclareAtom(XA_FILENAME)
-DeclareAtom(XA_HOSTNAME)
-DeclareAtom(XA_IP_ADDRESS)
-DeclareAtom(XA_LENGTH)
-DeclareAtom(XA_LIST_LENGTH)
-DeclareAtom(XA_NAME)
-DeclareAtom(XA_NET_ADDRESS)
-DeclareAtom(XA_NULL)
-DeclareAtom(XA_OWNER_OS)
-DeclareAtom(XA_SPAN)
-DeclareAtom(XA_TARGETS)
-DeclareAtom(XA_TEXT)
-DeclareAtom(XA_TIMESTAMP)
-DeclareAtom(XA_USER)
-DeclareAtom(XA_UTF8_STRING)
-
-#endif /* SUNSHLIB */
+/*

+

+Copyright 1991, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this 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 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.

+

+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.

+

+*/

+

+#if defined(SUNSHLIB) && !defined(SHAREDCODE)

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Atoms.h"

+

+struct _AtomRec {

+    char *name;

+    struct _DisplayRec* head;

+};

+

+#if !defined(UNIXCPP) || defined(ANSICPP)

+#define DeclareAtom(atom) \

+extern struct _AtomRec __##atom; \

+AtomPtr _##atom = &__##atom;

+#else

+#define DeclareAtom(atom) \

+extern struct _AtomRec __/**/atom; \

+AtomPtr _/**/atom = &__/**/atom;

+#endif

+

+DeclareAtom(XA_ATOM_PAIR)

+DeclareAtom(XA_CHARACTER_POSITION)

+DeclareAtom(XA_CLASS)

+DeclareAtom(XA_CLIENT_WINDOW)

+DeclareAtom(XA_CLIPBOARD)

+DeclareAtom(XA_COMPOUND_TEXT)

+DeclareAtom(XA_DECNET_ADDRESS)

+DeclareAtom(XA_DELETE)

+DeclareAtom(XA_FILENAME)

+DeclareAtom(XA_HOSTNAME)

+DeclareAtom(XA_IP_ADDRESS)

+DeclareAtom(XA_LENGTH)

+DeclareAtom(XA_LIST_LENGTH)

+DeclareAtom(XA_NAME)

+DeclareAtom(XA_NET_ADDRESS)

+DeclareAtom(XA_NULL)

+DeclareAtom(XA_OWNER_OS)

+DeclareAtom(XA_SPAN)

+DeclareAtom(XA_TARGETS)

+DeclareAtom(XA_TEXT)

+DeclareAtom(XA_TIMESTAMP)

+DeclareAtom(XA_USER)

+DeclareAtom(XA_UTF8_STRING)

+

+#endif /* SUNSHLIB */