From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 25 Dec 2008 14:41:32 +0000 (-0500)
Subject: The EXT2 ioctls are used on Linux to get/set file flags.
X-Git-Tag: v2.6.0~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df3ae9aee0c50cb2912ab64de7019e2d776a1f71;p=thirdparty%2Flibarchive.git

The EXT2 ioctls are used on Linux to get/set file flags.
The header defining these exists on some Cygwin installations,
but it's broken.  I don't think Cygwin supports these ioctls
anyway, so I don't see any point in including the header there.
Someone with more autoconf-fu than I have probably knows a better
solution to this problem.

SVN-Revision: 283
---

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 6f3e47a32..ef10723c1 100644
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.42 2008/12/06 05
 #include <sys/utime.h>
 #endif
 
-#ifdef HAVE_EXT2FS_EXT2_FS_H
-#include <ext2fs/ext2_fs.h>	/* for Linux file flags */
+#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__)
+#include <ext2fs/ext2_fs.h>	/* Linux file flags, broken on Cygwin */
 #endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/tar/write.c b/tar/write.c
index 4d36018af..9cc7200cb 100644
--- a/tar/write.c
+++ b/tar/write.c
@@ -44,7 +44,8 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.79 2008/11/27 05:49:52 kientzle
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#ifdef HAVE_EXT2FS_EXT2_FS_H
+#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__)
+/* This header exists but is broken on Cygwin. */
 #include <ext2fs/ext2_fs.h>
 #endif
 #ifdef HAVE_FCNTL_H