diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
| commit | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch) | |
| tree | dbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/src/util/atom.c | |
| parent | e16399e57caac9e859a7d28921c73ef9839b571e (diff) | |
| parent | d0f70707dde032e662dbd5bc70df6ac915403abe (diff) | |
| download | vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2 vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/src/fontfile/fontfile.c
libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/src/util/atom.c')
| -rw-r--r-- | libXfont/src/util/atom.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libXfont/src/util/atom.c b/libXfont/src/util/atom.c index 37811f91e..5f7f1c66d 100644 --- a/libXfont/src/util/atom.c +++ b/libXfont/src/util/atom.c @@ -158,6 +158,8 @@ MakeAtom(const char *string, unsigned len, int makeit) int h = 0; int r; + OVERRIDE_SYMBOL(MakeAtom, string, len, makeit); + hash = Hash (string, len); if (hashTable) { @@ -230,6 +232,7 @@ MakeAtom(const char *string, unsigned len, int makeit) weak int ValidAtom(Atom atom) { + OVERRIDE_SYMBOL(ValidAtom, atom); return (atom != None) && (atom <= lastAtom); } @@ -240,6 +243,7 @@ ValidAtom(Atom atom) weak char * NameForAtom(Atom atom) { + OVERRIDE_SYMBOL(NameForAtom, atom); if (atom != None && atom <= lastAtom) return reverseMap[atom]->name; return NULL; |