diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /mkfontscale | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'mkfontscale')
| -rw-r--r-- | mkfontscale/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkfontscale/hash.c b/mkfontscale/hash.c index 135380bff..c2cf9caa3 100644 --- a/mkfontscale/hash.c +++ b/mkfontscale/hash.c @@ -79,7 +79,7 @@ destroyHashTable(HashTablePtr table) char * getHash(HashTablePtr table, const char *key) { - int i = hash(key); + unsigned int i = hash(key); HashBucketPtr bp; for(bp = table[i]; bp; bp = bp->next) { if(strcasecmp(bp->key, key) == 0) @@ -91,7 +91,7 @@ getHash(HashTablePtr table, const char *key) int putHash(HashTablePtr table, char *key, char *value, int prio) { - int i = hash(key); + unsigned int i = hash(key); char *keycopy = NULL, *valuecopy = NULL; HashBucketPtr bp; for(bp = table[i]; bp; bp = bp->next) { |