From e02c30fac32e4873240e507cadc416f710188feb Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 17 Nov 2013 09:41:14 -0800 Subject: Remove SUNSHLIB support for SunOS 4.x shared libraries Never enabled in modular builds, was only enabled for SunOS 4.x in imake. Signed-off-by: Alan Coopersmith Reviewed-by: Mark Kettenis --- src/Atoms.c | 8 +------ src/Makefile.am | 3 +-- src/StrToCurs.c | 2 +- src/sharedlib.c | 67 --------------------------------------------------------- 4 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 src/sharedlib.c diff --git a/src/Atoms.c b/src/Atoms.c index 6f0ca64..d80f57a 100644 --- a/src/Atoms.c +++ b/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/src/Makefile.am b/src/Makefile.am index 7e31853..3aa88d1 100644 --- a/src/Makefile.am +++ b/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/src/StrToCurs.c b/src/StrToCurs.c index 6930e82..7bb1da1 100644 --- a/src/StrToCurs.c +++ b/src/StrToCurs.c @@ -88,7 +88,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/src/sharedlib.c b/src/sharedlib.c deleted file mode 100644 index b47213d..0000000 --- a/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 -#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 */ -- cgit v1.2.1