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 815845736fda6fe2c5dc533188a200804726a204..606de606e2c520007a63861e4d86ba404912a4b4 100644 (file)
--- 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 769134cbde58ac2930bb0c4db75439c3988ec893..08058aa4539610d47f55235757674202fd7b8556 100644 (file)
--- 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$");