From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 16 Dec 2009 14:12:20 +0000 (-0500)
Subject: Borland C++ does not provide sys/utime.h.
X-Git-Tag: v2.8.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=999ba60d78a940a6dd90892dd80c510ba963968e;p=thirdparty%2Flibarchive.git

Borland C++ does not provide sys/utime.h.
Use macro HAVE_SYS_UTIME_H to include sys/utime.h and also
use macro HAVE_UTIME_H to include utime.h.

SVN-Revision: 1752
---

diff --git a/cpio/test/test_option_a.c b/cpio/test/test_option_a.c
index 815845736..606de606e 100644
--- a/cpio/test/test_option_a.c
+++ b/cpio/test/test_option_a.c
@@ -23,10 +23,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <sys/utime.h>
-#else
+#if defined(HAVE_UTIME_H)
 #include <utime.h>
+#elif defined(HAVE_SYS_UTIME_H)
+#include <sys/utime.h>
 #endif
 __FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_a.c,v 1.3 2008/08/24 06:21:00 kientzle Exp $");
 
diff --git a/cpio/test/test_option_u.c b/cpio/test/test_option_u.c
index 769134cbd..08058aa45 100644
--- a/cpio/test/test_option_u.c
+++ b/cpio/test/test_option_u.c
@@ -23,10 +23,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <sys/utime.h>
-#else
+#if defined(HAVE_UTIME_H)
 #include <utime.h>
+#elif defined(HAVE_SYS_UTIME_H)
+#include <sys/utime.h>
 #endif
 __FBSDID("$FreeBSD$");