diff options
| author | joerg <joerg> | 2008-12-17 16:50:24 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-12-17 16:50:24 +0000 |
| commit | 44c67d72f70c1b969c71f428440ee2deb5f73faf (patch) | |
| tree | 882dfa9c023ffd4bd00b7053f9069eff2e80679d | |
| parent | ec3a94f024f1e4ec7659d372f37436288801e22e (diff) | |
| download | pkgsrc-44c67d72f70c1b969c71f428440ee2deb5f73faf.tar.gz | |
Improve linux compat. From christos@.
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_entry.c | 10 | ||||
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_write_disk.c | 13 | ||||
| -rw-r--r-- | archivers/libarchive/files/tar/write.c | 13 |
3 files changed, 27 insertions, 9 deletions
diff --git a/archivers/libarchive/files/libarchive/archive_entry.c b/archivers/libarchive/files/libarchive/archive_entry.c index 69921c309f1..dde2f976d4e 100644 --- a/archivers/libarchive/files/libarchive/archive_entry.c +++ b/archivers/libarchive/files/libarchive/archive_entry.c @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.52 2008/05/26 17:00:2 #include <sys/sysmacros.h> #endif #endif -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include <ext2fs/ext2_fs.h> /* for Linux file flags */ -#endif #ifdef HAVE_LIMITS_H #include <limits.h> #endif @@ -51,6 +48,13 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.52 2008/05/26 17:00:2 #ifdef HAVE_LINUX_EXT2_FS_H #include <linux/ext2_fs.h> /* for Linux file flags */ #endif +#ifdef HAVE_EXT2FS_EXT2_FS_H +/* + * This must be after the include of linux/ext2_fs.h, + * otherwise the former will fail. + */ +#include <ext2fs/ext2_fs.h> /* for Linux file flags */ +#endif #include <stddef.h> #include <stdio.h> #ifdef HAVE_STDLIB_H diff --git a/archivers/libarchive/files/libarchive/archive_write_disk.c b/archivers/libarchive/files/libarchive/archive_write_disk.c index 238173c42a2..a17c725111c 100644 --- a/archivers/libarchive/files/libarchive/archive_write_disk.c +++ b/archivers/libarchive/files/libarchive/archive_write_disk.c @@ -49,9 +49,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19 #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 @@ -64,6 +61,16 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19 #ifdef HAVE_LINUX_FS_H #include <linux/fs.h> /* for Linux file flags */ #endif +#ifdef HAVE_LINUX_EXT2_FS_H +#include <linux/ext2_fs.h> /* for Linux file flags */ +#endif +#ifdef HAVE_EXT2FS_EXT2_FS_H +/* + * This must be after the include of linux/ext2_fs.h, + * otherwise the former will fail. + */ +#include <ext2fs/ext2_fs.h> /* for Linux file flags */ +#endif #ifdef HAVE_LIMITS_H #include <limits.h> #endif diff --git a/archivers/libarchive/files/tar/write.c b/archivers/libarchive/files/tar/write.c index 3d4fd186b99..2552226df48 100644 --- a/archivers/libarchive/files/tar/write.c +++ b/archivers/libarchive/files/tar/write.c @@ -44,9 +44,6 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.70 2008/05/26 17:10:10 kientzle #ifdef HAVE_ERRNO_H #include <errno.h> #endif -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include <ext2fs/ext2_fs.h> -#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -62,6 +59,16 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.70 2008/05/26 17:10:10 kientzle #ifdef HAVE_LINUX_FS_H #include <linux/fs.h> /* for Linux file flags */ #endif +#ifdef HAVE_LINUX_EXT2_FS_H +#include <linux/ext2_fs.h> /* for Linux file flags */ +#endif +#ifdef HAVE_EXT2FS_EXT2_FS_H +/* + * This must be after the include of linux/ext2_fs.h, + * otherwise the former will fail. + */ +#include <ext2fs/ext2_fs.h> /* for Linux file flags */ +#endif #ifdef HAVE_PWD_H #include <pwd.h> #endif |