47 lines
1.1 KiB
C
47 lines
1.1 KiB
C
$NetBSD: patch-src_fcstat.c,v 1.4 2014/07/15 14:48:34 ryoon Exp $
|
|
|
|
The argument types to scandir(3) differ between different OSes.
|
|
OpenBSD seems to be still different. I used the provided alphasort
|
|
instead of rewriting the equivalent sorter function.
|
|
statvfs and fstatvfs need another include file, at least on MirBSD.
|
|
|
|
--- src/fcstat.c.orig 2014-03-05 09:27:42.000000000 +0000
|
|
+++ src/fcstat.c
|
|
@@ -42,6 +42,12 @@
|
|
#ifdef HAVE_SYS_MOUNT_H
|
|
#include <sys/mount.h>
|
|
#endif
|
|
+#ifdef __MirBSD__
|
|
+#include <sys/statvfs.h>
|
|
+#endif
|
|
+#if defined(_SCO_DS)
|
|
+#include "../scandir.c"
|
|
+#endif
|
|
|
|
#ifdef _WIN32
|
|
#ifdef __GNUC__
|
|
@@ -158,7 +164,11 @@ Adler32Finish (struct Adler32 *ctx)
|
|
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
|
|
/* dirent.d_type can be relied upon on FAT filesystem */
|
|
static FcBool
|
|
+# ifdef __MirBSD__
|
|
+FcDirChecksumScandirFilter(struct dirent *entry)
|
|
+# else
|
|
FcDirChecksumScandirFilter(const struct dirent *entry)
|
|
+# endif
|
|
{
|
|
return entry->d_type != DT_DIR;
|
|
}
|
|
@@ -197,7 +207,11 @@ FcDirChecksum (const FcChar8 *dir, time_
|
|
#else
|
|
NULL,
|
|
#endif
|
|
+#ifdef __MirBSD__
|
|
+ &alphasort);
|
|
+#else
|
|
&FcDirChecksumScandirSorter);
|
|
+#endif
|
|
if (n == -1)
|
|
return -1;
|
|
|