Attachment #513436 for bug #643530

Lines 25-30 Link Here

(-)a/openbsd-compat/bsd-statvfs.c (+3 lines)
25		25
26	#include <errno.h>	26	#include <errno.h>
27		27
		28	#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) \|\| \
		29	(!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
28	static void	30	static void
29	copy_statfs_to_statvfs(struct statvfs to, struct statfs from)	31	copy_statfs_to_statvfs(struct statvfs to, struct statfs from)
30	{	32	{
Lines 40-45 Link Here
40	to->f_flag = from->f_flags;	42	to->f_flag = from->f_flags;
41	to->f_namemax = MNAMELEN;	43	to->f_namemax = MNAMELEN;
42	}	44	}
		45	#endif
43		46
44	# ifndef HAVE_STATVFS	47	# ifndef HAVE_STATVFS
45	int statvfs(const char path, struct statvfs buf)	48	int statvfs(const char path, struct statvfs buf)

Lines 26-31 Link Here

(-)a/openbsd-compat/bsd-statvfs.h (+6 lines)
26	#ifdef HAVE_SYS_STATFS_H	26	#ifdef HAVE_SYS_STATFS_H
27	#include <sys/statfs.h>	27	#include <sys/statfs.h>
28	#endif	28	#endif
		29	#ifdef HAVE_SYS_STATVFS_H
		30	#include <sys/statvfs.h>
		31	#endif
29	#ifndef HAVE_FSBLKCNT_T	32	#ifndef HAVE_FSBLKCNT_T
30	typedef unsigned long fsblkcnt_t;	33	typedef unsigned long fsblkcnt_t;
Lines 42-47 Link Here
42	#endif	45	#endif
43	/* as defined in IEEE Std 1003.1, 2004 Edition */	46	/* as defined in IEEE Std 1003.1, 2004 Edition */
		47	#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) \|\| \
		48	(!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
44	struct statvfs {	49	struct statvfs {
45	unsigned long f_bsize; /* File system block size. */	50	unsigned long f_bsize; /* File system block size. */
46	unsigned long f_frsize; /* Fundamental file system block size. */	51	unsigned long f_frsize; /* Fundamental file system block size. */
Lines 59-64 Link Here
59	unsigned long f_namemax;/* Maximum filename length. */	64	unsigned long f_namemax;/* Maximum filename length. */
60	};	65	};
61	#endif	66	#endif
		67	#endif
62	#ifndef HAVE_STATVFS	68	#ifndef HAVE_STATVFS
63	int statvfs(const char , struct statvfs );	69	int statvfs(const char , struct statvfs );

Return to bug 643530