From df3ae9aee0c50cb2912ab64de7019e2d776a1f71 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 25 Dec 2008 09:41:32 -0500 Subject: [PATCH] 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 --- libarchive/archive_write_disk.c | 4 ++-- tar/write.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) 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 #endif -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include /* for Linux file flags */ +#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__) +#include /* Linux file flags, broken on Cygwin */ #endif #ifdef HAVE_ERRNO_H #include 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 #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 #endif #ifdef HAVE_FCNTL_H -- 2.47.3