From: Mark Eichin <eichin@mit.edu>
Date: Wed, 27 Jul 1994 20:23:21 +0000 (+0000)
Subject: USE_DIRENT_H
X-Git-Tag: krb5-1.0-beta4.2~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cd06528073315959756d8dad654ae0944da85f3;p=krb5.git

USE_DIRENT_H

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4022 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 0061c7d4f..93f455b43 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,5 +1,7 @@
 Wed Jul 27 12:52:04 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
 
+	* krcp.c (rsource): USE_DIRENT_H.
+
 	* configure.in: test for HAVE_UNISTD_H.
 	* logutil.c: use HAVE_UNISTD_H.
 
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index c247a4469..4a98b2d31 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rcp.c	5.10 (Berkeley) 9/20/88";
 #define _TYPES_
 #endif
 #include <sys/file.h>
-#ifdef CRAY
+#ifdef NEED_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
 #include <sys/stat.h>
@@ -628,14 +628,10 @@ source(argc, argv)
 
 
 
-#if defined(SYSV) && !defined(sysvimp)
-#include <dirent.h>
-#else
-#ifdef sysvimp
-#include <ufs/fsdir.h>
-#else
+#ifndef USE_DIRENT_H
 #include <sys/dir.h>
-#endif
+#else
+#include <dirent.h>
 #endif
 
 rsource(name, statp)
@@ -644,7 +640,7 @@ rsource(name, statp)
 {
     DIR *d = opendir(name);
     char *last;
-#if defined(SYSV) && !defined(sysvimp)
+#ifdef USE_DIRENT_H
     struct dirent *dp;
 #else
     struct direct *dp;