diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /mkfontscale/hash.c | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'mkfontscale/hash.c')
| -rw-r--r-- | mkfontscale/hash.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkfontscale/hash.c b/mkfontscale/hash.c index 3adfb6861..58f1b6940 100644 --- a/mkfontscale/hash.c +++ b/mkfontscale/hash.c @@ -23,6 +23,7 @@ #include "config.h" #include <stdlib.h> +#include <unistd.h> #include <stdio.h> #include <string.h> #include <ctype.h> @@ -150,7 +151,8 @@ hashElements(HashTablePtr table) static int key_first_cmp(const void *v1, const void *v2) { - const HashBucketPtr *b1 = v1, *b2 = v2; + const HashBucketPtr *b1 = (const HashBucketPtr *)v1; + const HashBucketPtr *b2 = (const HashBucketPtr *)v2; int c1 = strcasecmp((*b1)->key, (*b2)->key); if(c1 != 0) return c1; return strcmp((*b1)->value, (*b2)->value); @@ -159,7 +161,8 @@ key_first_cmp(const void *v1, const void *v2) static int value_first_cmp(const void *v1, const void *v2) { - const HashBucketPtr *b1 = v1, *b2 = v2; + const HashBucketPtr *b1 = (const HashBucketPtr *)v1; + const HashBucketPtr *b2 = (const HashBucketPtr *)v2; int c1 = strcmp((*b1)->value, (*b2)->value); if(c1 != 0) return c1; return strcasecmp((*b1)->key, (*b2)->key); |