From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 21 Dec 2009 03:54:28 +0000 (-0500)
Subject: On Borland C environment, both dirent.h and direct.h are available.
X-Git-Tag: v2.8.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e31f8aeddd7938e544e7be692c4a77fddae63d8;p=thirdparty%2Flibarchive.git

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 2d5a86348..c7515501b 100644
--- 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 b0e13c762..077cccbc9 100644
--- 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 d6a9275a8..7542877aa 100644
--- 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