mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use statvfs on OSX.

Browse source 
Fixes a recent-ish build warning on about 64 bit vs non.

This is the method used by the disk-free-space library, and I tested it to
yield the same results on even 10 tb drives on OSX -- so it's getting 64
bit values.
This commit is contained in:
Joey Hess 2015-10-19 17:09:06 -04:00
parent 849c0a1c67
commit b9c6a56b0e
Failed to extract signature
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Utility/libdiskfree.c
View file

@ -7,14 +7,6 @@
/* 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>
# define STATCALL statfs
# define STATSTRUCT statfs64
# define BSIZE f_bsize
#else
#if defined (__FreeBSD__)
# include <sys/param.h>
# include <sys/mount.h>
@ -26,8 +18,8 @@
# warning free space checking code not available for Android
# define UNKNOWN
#else
#if defined (__linux__) || defined (__FreeBSD_kernel__) || (defined (__SVR4) && defined (__sun))
/* Linux or Debian kFreeBSD or Solaris */
#if defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD_kernel__) || (defined (__SVR4) && defined (__sun))
/* Linux or OSX or Debian kFreeBSD or Solaris */
/* This is a POSIX standard, so might also work elsewhere too. */
# include <sys/statvfs.h>
# define STATCALL statvfs
@ -39,7 +31,6 @@
#endif
#endif
#endif
#endif
#include <errno.h>
#include <stdio.h>

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20151020) UNRELEASED; urgency=medium
* Use statvfs on OSX.
-- Joey Hess <id@joeyh.name> Mon, 19 Oct 2015 17:00:21 -0400
git-annex (5.20151019) unstable; urgency=medium
* Fix a longstanding, but unlikely to occur bug, where dropping