diff options
author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /libXfont/src/util/atom.c | |
parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXfont/src/util/atom.c')
-rw-r--r-- | libXfont/src/util/atom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXfont/src/util/atom.c b/libXfont/src/util/atom.c index f15e3d8de..c47cb5c80 100644 --- a/libXfont/src/util/atom.c +++ b/libXfont/src/util/atom.c @@ -54,7 +54,7 @@ static int reverseMapSize; static Atom lastAtom; static int -Hash(char *string, int len) +Hash(const char *string, int len) { int h; @@ -146,8 +146,8 @@ NameEqual (const char *a, const char *b, int l) #pragma weak MakeAtom #endif -weak Atom -MakeAtom(char *string, unsigned len, int makeit) +weak Atom +MakeAtom(const char *string, unsigned len, int makeit) { AtomListPtr a; int hash; @@ -223,7 +223,7 @@ MakeAtom(char *string, unsigned len, int makeit) #pragma weak ValidAtom #endif -weak int +weak int ValidAtom(Atom atom) { return (atom != None) && (atom <= lastAtom); |