summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-31 12:20:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-31 12:20:27 -0400
commit5114e9f971a6b18beac645319865d95ae3a314e3 (patch)
tree4c46ad1f8013395c95b7e610d88bf09eab6d94a2
parent98bc86a4847b5ba08e6fe087862f7ac40ae91a59 (diff)
OSX: Switched away from deprecated statfs64 interface.
Getting rid of build warning warning: 'statfs64' is deprecated: first deprecated in OS X 10.6 [-Wdeprecated-declarations] 10.6 is much older than the oldest git-annex OSX port, so won't break anything.
-rw-r--r--Utility/libdiskfree.c6
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 4 deletions
diff --git a/Utility/libdiskfree.c b/Utility/libdiskfree.c
index b531435df..fd8f87766 100644
--- a/Utility/libdiskfree.c
+++ b/Utility/libdiskfree.c
@@ -8,12 +8,10 @@
/* Include appropriate headers for the OS, and define what will be used to
* check the free space. */
#if defined(__APPLE__)
+# define _DARWIN_FEATURE_64_BIT_INODE 1
# include <sys/param.h>
# include <sys/mount.h>
-/* In newer OSX versions, statfs64 is deprecated, in favor of statfs,
- * which is 64 bit only with a build option -- but statfs64 still works,
- * and this keeps older OSX also supported. */
-# define STATCALL statfs64
+# define STATCALL statfs
# define STATSTRUCT statfs64
#else
#if defined (__FreeBSD__)
diff --git a/debian/changelog b/debian/changelog
index a387baadf..d7732cf33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ git-annex (5.20141220) UNRELEASED; urgency=medium
* Windows: Fix local rsync filepath munging (fixes 26 test suite failures).
* Windows: Got the rsync special remote working.
* Windows: Fix handling of views of filenames containing '%'
+ * OSX: Switched away from deprecated statfs64 interface.
-- Joey Hess <id@joeyh.name> Mon, 22 Dec 2014 15:16:38 -0400