diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
| commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
| tree | c9891fdc315c41cc90806634589231172572b2ba /fontconfig/src/fcstat.c | |
| parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'fontconfig/src/fcstat.c')
| -rw-r--r-- | fontconfig/src/fcstat.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index 9e84aa490..0263a0082 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/src/fcstat.c @@ -164,11 +164,21 @@ FcDirChecksumScandirFilter(const struct dirent *entry) } #endif +#ifdef HAVE_SCANDIR static int FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs) { return strcmp((*lhs)->d_name, (*rhs)->d_name); } +#elif HAVE_SCANDIR_VOID_P +static int +FcDirChecksumScandirSorter(const void *a, const void *b) +{ + const struct dirent *lhs = a, *rhs = b; + + return strcmp(lhs->d_name, rhs->d_name); +} +#endif static int FcDirChecksum (const FcChar8 *dir, time_t *checksum) |