diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
| commit | 285b1bd8933288fc56259cfb3de61207c8e35d9e (patch) | |
| tree | 2107aaa7f683f16a9a1a73e5f6f2d7ba53710f32 /fontconfig | |
| parent | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (diff) | |
| parent | 4eb0b643ad978d94837e2d587a5d4358f974a25c (diff) | |
| download | vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.gz vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.bz2 vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 24 oct 2013
Conflicts:
xorg-server/glx/glxdricommon.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/test/test-migration.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fontconfig/test/test-migration.c b/fontconfig/test/test-migration.c index a0ab83902..970965186 100644 --- a/fontconfig/test/test-migration.c +++ b/fontconfig/test/test-migration.c @@ -4,6 +4,11 @@ #include <unistd.h> #include <sys/types.h> #include <dirent.h> +#ifndef HAVE_STRUCT_DIRENT_D_TYPE +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#endif #include <fontconfig/fontconfig.h> FcBool @@ -36,6 +41,9 @@ unlink_dirs(const char *dir) size_t len = strlen (dir); char *n = NULL; FcBool ret = FcTrue; +#ifndef HAVE_STRUCT_DIRENT_D_TYPE + struct stat statb; +#endif if (!d) return FcFalse; @@ -53,7 +61,17 @@ unlink_dirs(const char *dir) strcpy (n, dir); n[len] = '/'; strcpy (&n[len + 1], e->d_name); +#ifdef HAVE_STRUCT_DIRENT_D_TYPE if (e->d_type == DT_DIR) +#else + if (stat (n, &statb) == -1) + { + fprintf (stderr, "E: %s\n", n); + ret = FcFalse; + break; + } + if (S_ISDIR (statb.st_mode)) +#endif { if (!unlink_dirs (n)) { |