diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
| commit | 156e37d3879b316329e3e05579414031da2647e2 (patch) | |
| tree | 59fb1dce046fd3aab228e224bff8b0c1d074f876 /libXmu/src/Atoms.c | |
| parent | d783adea42f29bd7917929597ca1031b70587e1d (diff) | |
| download | vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.gz vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.bz2 vcxsrv-156e37d3879b316329e3e05579414031da2647e2.zip | |
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
14 nov 2011
Diffstat (limited to 'libXmu/src/Atoms.c')
| -rw-r--r-- | libXmu/src/Atoms.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libXmu/src/Atoms.c b/libXmu/src/Atoms.c index 412f399e7..6f0ca64a0 100644 --- a/libXmu/src/Atoms.c +++ b/libXmu/src/Atoms.c @@ -50,7 +50,7 @@ typedef struct _DisplayRec { } DisplayRec; struct _AtomRec { - char *name; + _Xconst char *name; DisplayRec* head; }; @@ -60,15 +60,9 @@ struct _AtomRec { #define STATIC static #endif -#if !defined(UNIXCPP) || defined(ANSICPP) #define DeclareAtom(atom,text) \ STATIC struct _AtomRec __##atom = { text, NULL }; \ AtomPtr _##atom = &__##atom; -#else -#define DeclareAtom(atom,text) \ -STATIC struct _AtomRec __/**/atom = { text, NULL }; \ -AtomPtr _/**/atom = &__/**/atom; -#endif DeclareAtom(XA_ATOM_PAIR, "ATOM_PAIR" ) DeclareAtom(XA_CHARACTER_POSITION, "CHARACTER_POSITION" ) @@ -105,7 +99,7 @@ AtomPtr XmuMakeAtom(_Xconst char *name) { AtomPtr ptr = XtNew(struct _AtomRec); - ptr->name = (char *) name; + ptr->name = name; ptr->head = NULL; return ptr; } @@ -113,7 +107,7 @@ XmuMakeAtom(_Xconst char *name) char * XmuNameOfAtom(AtomPtr atom_ptr) { - return atom_ptr->name; + return (char *) atom_ptr->name; } |