diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
| commit | 93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch) | |
| tree | 3fdcae64c6a51d6512aa32387846a2f282439855 /libXmu/src/sharedlib.c | |
| parent | 00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff) | |
| parent | 156e37d3879b316329e3e05579414031da2647e2 (diff) | |
| download | vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2 vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/util/makekeys.c
Diffstat (limited to 'libXmu/src/sharedlib.c')
| -rw-r--r-- | libXmu/src/sharedlib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libXmu/src/sharedlib.c b/libXmu/src/sharedlib.c index 4bb8c3b5f..b47213df5 100644 --- a/libXmu/src/sharedlib.c +++ b/libXmu/src/sharedlib.c @@ -36,15 +36,9 @@ struct _AtomRec { 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) |