Apparently, linux/ext2_fs.h is entirely different from ext2/ext2_fs.h

and is, in fact, in the process of being deprecated.  Use the latter
exclusively.

SVN-Revision: 140

diff --git a/configure.ac b/configure.ac
index 9f92a048e3a9e52ebe7d442da00c52239a611785..7c717a83cdd0fb1d75a06cb4fd7a8ee2c7c8945e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
-AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/ext2_fs.h linux/fs.h])
+AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/fs.h])
 # Include inttypes.h into archive.h only if appropriate.
 # We can't use the HAVE_INTTYPES_H macro here because archive.h
 # gets installed as a system header and then included into client code

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 53c62a6c81c3bb9401ffe94ea068a626105b952c..ef6644b1d5e4b05780873e994ff6ec36bd9b6353 100644 (file)
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.25 2008/05/26 17:00:23 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19:05:29 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -64,9 +64,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.25 2008/05/26 17
 #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_LIMITS_H
 #include <limits.h>
 #endif

diff --git a/tar/write.c b/tar/write.c
index 37d21df0c8c6f861cd23c48fe84d80f4c8112ff2..1a6e9289abe7a759498df316c0c67f1c004c1f30 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -62,9 +62,6 @@ __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_PWD_H
 #include <pwd.h>
 #endif