646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
29 lines
786 B
Diff
29 lines
786 B
Diff
diff --git a/vobcopy.h b/vobcopy.h
|
|
index dcf4266..d34c2b4 100644
|
|
--- a/vobcopy.h
|
|
+++ b/vobcopy.h
|
|
@@ -115,6 +115,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
|
|
|
|
#ifdef HAVE_SYS_STATVFS_H
|
|
#include <sys/statvfs.h>
|
|
+#ifndef __APPLE__
|
|
#ifndef USE_STATFS
|
|
#define USE_STATVFS
|
|
#ifndef USE_STATFS_FOR_DEV
|
|
@@ -122,6 +123,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
|
|
#endif
|
|
#endif
|
|
#endif
|
|
+#endif
|
|
|
|
#ifdef HAVE_MNTENT_H
|
|
#include <mntent.h>
|
|
@@ -164,6 +166,6 @@ char *safestrncpy(char *dest, const char *src, size_t n);
|
|
int check_progress( void ); /* this can be removed because the one below supersedes it */
|
|
int progressUpdate( int starttime, int cur, int tot, int force );
|
|
|
|
-#ifndef HAVE_FDATASYNC
|
|
+#if !defined(HAVE_FDATASYNC) || defined(__APPLE__)
|
|
#define fdatasync(fd) 0
|
|
#endif
|