4 files changed, 3 insertions, 77 deletions
diff --git a/libXmu/src/Atoms.c b/libXmu/src/Atoms.c
index 6f0ca64a0..d80f57ad5 100644
--- a/libXmu/src/Atoms.c
+++ b/libXmu/src/Atoms.c
@@ -54,14 +54,8 @@ struct _AtomRec {
     DisplayRec* head;
 };
 
-#ifdef SUNSHLIB
-#define STATIC
-#else
-#define STATIC static
-#endif
-
 #define DeclareAtom(atom,text) \
-STATIC struct _AtomRec __##atom = { text, NULL }; \
+static struct _AtomRec __##atom = { text, NULL }; \
 AtomPtr _##atom = &__##atom;
 
 DeclareAtom(XA_ATOM_PAIR,		"ATOM_PAIR"		)
diff --git a/libXmu/src/Makefile.am b/libXmu/src/Makefile.am
index 7e3185309..3aa88d12f 100644
--- a/libXmu/src/Makefile.am
+++ b/libXmu/src/Makefile.am
@@ -62,8 +62,7 @@ libXmu_la_SOURCES = \
 	UpdMapHint.c \
 	VisCmap.c \
 	WidgetNode.c \
-	Xct.c \
-	sharedlib.c
+	Xct.c
 
 
 if LINT
diff --git a/libXmu/src/StrToCurs.c b/libXmu/src/StrToCurs.c
index 714b004ee..17695ed1f 100644
--- a/libXmu/src/StrToCurs.c
+++ b/libXmu/src/StrToCurs.c
@@ -89,7 +89,7 @@ SOFTWARE.
    and broken object file formats that don't correctly distinguish
    references to procedures from references to data.
  */
-#if defined(SUNSHLIB) || defined(SVR4)
+#if defined(SVR4)
 #define XMU_KLUDGE
 #endif
 
diff --git a/libXmu/src/sharedlib.c b/libXmu/src/sharedlib.c
deleted file mode 100644
index b47213df5..000000000
--- a/libXmu/src/sharedlib.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-
-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;
-};
-
-#define DeclareAtom(atom) \
-extern struct _AtomRec __##atom; \
-AtomPtr _##atom = &__##atom;
-
-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 */