diff options
author | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 18:48:22 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 18:48:22 +1100 |
commit | 5055699c7f7c7ef21703a443ec73117da392f6ae (patch) | |
tree | c2520c844a97d757e482fec8e1ee22fcde90bc9e | |
parent | a5cf1e220def07290260e4125e74f41ac75cf88d (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-- | ChangeLog | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-statvfs.h | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -36,6 +36,8 @@ | |||
36 | openbsd-compat/bsd-statvfs.h] Implement enough of statvfs on top of statfs | 36 | openbsd-compat/bsd-statvfs.h] Implement enough of statvfs on top of statfs |
37 | to be useful (and for the regression tests to pass) on platforms that | 37 | to be useful (and for the regression tests to pass) on platforms that |
38 | have statfs and fstatfs. ok djm@ | 38 | have statfs and fstatfs. ok djm@ |
39 | - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we | ||
40 | need them to cut down on the name collisions. | ||
39 | 41 | ||
40 | 20140118 | 42 | 20140118 |
41 | - (djm) OpenBSD CVS Sync | 43 | - (djm) OpenBSD CVS Sync |
diff --git a/openbsd-compat/bsd-statvfs.h b/openbsd-compat/bsd-statvfs.h index 057407cc8..dfd609974 100644 --- a/openbsd-compat/bsd-statvfs.h +++ b/openbsd-compat/bsd-statvfs.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-statvfs.h,v 1.2 2014/01/17 07:10:59 dtucker Exp $ */ | 1 | /* $Id: bsd-statvfs.h,v 1.3 2014/01/17 07:48:22 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2008,2014 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2008,2014 Darren Tucker <dtucker@zip.com.au> |
@@ -18,6 +18,8 @@ | |||
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | 20 | ||
21 | #if !defined(HAVE_STATVFS) || !defined(HAVE_FSTATVFS) | ||
22 | |||
21 | #include <sys/types.h> | 23 | #include <sys/types.h> |
22 | 24 | ||
23 | #ifdef HAVE_SYS_MOUNT_H | 25 | #ifdef HAVE_SYS_MOUNT_H |
@@ -27,8 +29,6 @@ | |||
27 | #include <sys/statfs.h> | 29 | #include <sys/statfs.h> |
28 | #endif | 30 | #endif |
29 | 31 | ||
30 | #if !defined(HAVE_STATVFS) || !defined(HAVE_FSTATVFS) | ||
31 | |||
32 | #ifndef HAVE_FSBLKCNT_T | 32 | #ifndef HAVE_FSBLKCNT_T |
33 | typedef unsigned long fsblkcnt_t; | 33 | typedef unsigned long fsblkcnt_t; |
34 | #endif | 34 | #endif |