aboutsummaryrefslogtreecommitdiff
path: root/libXmu/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-25 08:30:07 +0100
committermarha <marha@users.sourceforge.net>2013-11-25 08:30:07 +0100
commita473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (patch)
tree063ea788b90cc200b84b40ce431a7649045de907 /libXmu/src
parent697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (diff)
downloadvcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.gz
vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.bz2
vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.zip
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
xserver commit 80481267662c8687e73081237913fa561e7a6561 libX11 commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b libXmu commit e02c30fac32e4873240e507cadc416f710188feb mesa commit 72cae2a599881e926b8709f4dfa2cc3591ea7a02
Diffstat (limited to 'libXmu/src')
-rw-r--r--libXmu/src/Atoms.c8
-rw-r--r--libXmu/src/Makefile.am3
-rw-r--r--libXmu/src/StrToCurs.c2
-rw-r--r--libXmu/src/sharedlib.c67
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 6930e8213..7bb1da1cc 100644
--- a/libXmu/src/StrToCurs.c
+++ b/libXmu/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/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 */