From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 4 Feb 2010 00:37:27 +0000 (-0500)
Subject: Fix build failure on Cygwin.
X-Git-Tag: v3.0.0a~1289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8906a0a50c144922ef25c85f2d58302b6e2f1294;p=thirdparty%2Flibarchive.git

Fix build failure on Cygwin.

SVN-Revision: 1864
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 054a89384..8e1dfdb28 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_entry_from_file.c 2010
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_WINIOCTL_H
+#if defined(HAVE_WINIOCTL_H) && !defined(__CYGWIN__)
 #include <winioctl.h>
 #endif
 
diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 053080d65..885755107 100644
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -95,7 +95,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_disk.c 201159 2009-12-29 0
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
-#ifdef HAVE_WINIOCTL_H
+#if defined(HAVE_WINIOCTL_H) && !defined(__CYGWIN__)
 #include <winioctl.h>
 #endif