aboutsummaryrefslogtreecommitdiff
path: root/libXmu/src/Atoms.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
committermarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
commit0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch)
tree8239768e506a03837019c4f02c8ab949c04a0818 /libXmu/src/Atoms.c
parent7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff)
parenta473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff)
downloadvcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013 Conflicts: libXinerama/src/Xinerama.c
Diffstat (limited to 'libXmu/src/Atoms.c')
-rw-r--r--libXmu/src/Atoms.c8
1 files changed, 1 insertions, 7 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" )