On Borland C environment, both dirent.h and direct.h are available.

SVN-Revision: 1769

diff --git a/cpio/test/test.h b/cpio/test/test.h
index 2d5a86348923d310db8326d786e71b6b3d2ca2d0..c7515501ba7fa3aa1e1131715b435833682d6622 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -53,7 +53,8 @@
 #endif
 #if HAVE_DIRENT_H
 #include <dirent.h>
-#else
+#endif
+#ifdef HAVE_DIRECT_H
 #include <direct.h>
 #define dirent direct
 #endif

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index b0e13c7629fecccb8c88f8d837927e85d8e2f8fa..077cccbc9489146f405535c71d2a721932a2e834 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -53,7 +53,8 @@
 #endif
 #if HAVE_DIRENT_H
 #include <dirent.h>
-#else
+#endif
+#ifdef HAVE_DIRECT_H
 #include <direct.h>
 #define dirent direct
 #endif

diff --git a/tar/test/test.h b/tar/test/test.h
index d6a9275a8f1e25ff3893b0abe48ab8c078aa0803..7542877aab7602b9d1b80f9aa50317fe5b1a835e 100644 (file)
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -53,7 +53,8 @@
 #endif
 #if HAVE_DIRENT_H
 #include <dirent.h>
-#else
+#endif
+#ifdef HAVE_DIRECT_H
 #include <direct.h>
 #define dirent direct
 #endif