summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-01-17 18:48:22 +1100
committerDarren Tucker <dtucker@zip.com.au>2014-01-17 18:48:22 +1100
commit5055699c7f7c7ef21703a443ec73117da392f6ae (patch)
treec2520c844a97d757e482fec8e1ee22fcde90bc9e
parenta5cf1e220def07290260e4125e74f41ac75cf88d (diff)
- (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
need them to cut down on the name collisions.
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/bsd-statvfs.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 70dad451..3822b048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
openbsd-compat/bsd-statvfs.h] Implement enough of statvfs on top of statfs
to be useful (and for the regression tests to pass) on platforms that
have statfs and fstatfs. ok djm@
+ - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
+ need them to cut down on the name collisions.
20140118
- (djm) OpenBSD CVS Sync
diff --git a/openbsd-compat/bsd-statvfs.h b/openbsd-compat/bsd-statvfs.h
index 057407cc..dfd60997 100644
--- a/openbsd-compat/bsd-statvfs.h
+++ b/openbsd-compat/bsd-statvfs.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-statvfs.h,v 1.2 2014/01/17 07:10:59 dtucker Exp $ */
+/* $Id: bsd-statvfs.h,v 1.3 2014/01/17 07:48:22 dtucker Exp $ */
/*
* Copyright (c) 2008,2014 Darren Tucker <dtucker@zip.com.au>
@@ -18,6 +18,8 @@
#include "includes.h"
+#if !defined(HAVE_STATVFS) || !defined(HAVE_FSTATVFS)
+
#include <sys/types.h>
#ifdef HAVE_SYS_MOUNT_H
@@ -27,8 +29,6 @@
#include <sys/statfs.h>
#endif
-#if !defined(HAVE_STATVFS) || !defined(HAVE_FSTATVFS)
-
#ifndef HAVE_FSBLKCNT_T
typedef unsigned long fsblkcnt_t;
#endif