diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-07 00:36:50 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-07 00:36:50 +0000 |
| commit | 4797bb943591f8214e14241924df1f4a33551ec1 (patch) | |
| tree | 410a1841c4f1b8fa59dfa45c482bd7c42c809e2c /lib/libarchive/archive_write_disk.c | |
| parent | 14289cd993800fce6830d92e075b41da9c5be8cb (diff) | |
Notes
Diffstat (limited to 'lib/libarchive/archive_write_disk.c')
| -rw-r--r-- | lib/libarchive/archive_write_disk.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/libarchive/archive_write_disk.c b/lib/libarchive/archive_write_disk.c index ab43c3fea6b5..ea19d5e27653 100644 --- a/lib/libarchive/archive_write_disk.c +++ b/lib/libarchive/archive_write_disk.c @@ -51,10 +51,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_SYS_UTIME_H #include <sys/utime.h> #endif - -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include <ext2fs/ext2_fs.h> /* for Linux file flags */ -#endif #ifdef HAVE_ERRNO_H #include <errno.h> #endif @@ -67,6 +63,16 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_LINUX_FS_H #include <linux/fs.h> /* for Linux file flags */ #endif +/* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. + * As the include guards don't agree, the order of include is important. + */ +#ifdef HAVE_LINUX_EXT2_FS_H +#include <linux/ext2_fs.h> /* for Linux file flags */ +#endif +#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__) +#include <ext2fs/ext2_fs.h> /* Linux file flags, broken on Cygwin */ +#endif #ifdef HAVE_LIMITS_H #include <limits.h> #endif |