diff options
| author | bde <bde@FreeBSD.org> | 1996-09-24 08:08:11 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-09-24 08:08:11 +0000 |
| commit | d2512c2bf99a15faab2ee38b498042767afbfc50 (patch) | |
| tree | a7dcc2bf16ed815097f05a03a82f3f704338c35d /usr.sbin | |
| parent | 1ba7894bc0e2cb3f9e9a098a97edce8d61d95f8f (diff) | |
| download | FreeBSD-src-d2512c2bf99a15faab2ee38b498042767afbfc50.zip FreeBSD-src-d2512c2bf99a15faab2ee38b498042767afbfc50.tar.gz | |
Eliminated includes of the "temporary" backwards compatibility header
<sys/dir.h> in applications. Maintained existing (inadequate) ifdefs
for dir.h vs dirent.h in libdialog, amd and rarpd, but didn't add any
new ones.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/amd/amd/info_union.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rarpd/rarpd.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sup/lib/expand.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sup/lib/scan.c | 7 |
4 files changed, 18 insertions, 9 deletions
diff --git a/usr.sbin/amd/amd/info_union.c b/usr.sbin/amd/amd/info_union.c index e3062ad..07e44a1 100644 --- a/usr.sbin/amd/amd/info_union.c +++ b/usr.sbin/amd/amd/info_union.c @@ -37,7 +37,7 @@ * * @(#)info_union.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_union.c,v 5.2.2.1 1992/02/09 15:08:34 jsp beta $ + * $Id: info_union.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ @@ -52,7 +52,9 @@ #ifdef HAS_UNION_MAPS -#ifdef _POSIX_SOURCE +#include <unistd.h> /* for _POSIX_VERSION ifdef */ + +#if defined(_POSIX_SOURCE) || defined(_POSIX_VERSION) #include <dirent.h> #define DIRENT struct dirent #else diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 8fb06f4..90ca240 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -26,7 +26,7 @@ char copyright[] = #ifndef lint static char rcsid[] = - "@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.5 1995/07/18 21:35:32 wpaul Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.6 1996/08/24 23:05:08 wpaul Exp $ (LBL)"; #endif @@ -60,7 +60,11 @@ static char rcsid[] = #include <sys/file.h> #include <netdb.h> -#ifdef SUNOS4 +#if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */ +#define HAVE_DIRENT_H +#endif + +#ifdef HAVE_DIRENT_H #include <dirent.h> #else #include <sys/dir.h> @@ -456,7 +460,7 @@ rarp_bootable(addr) u_long addr; { -#ifdef SUNOS4 +#ifdef HAVE_DIRENT_H register struct dirent *dent; #else register struct direct *dent; diff --git a/usr.sbin/sup/lib/expand.c b/usr.sbin/sup/lib/expand.c index ff4b094..b909efc 100644 --- a/usr.sbin/sup/lib/expand.c +++ b/usr.sbin/sup/lib/expand.c @@ -61,7 +61,7 @@ */ #include <sys/param.h> #include <sys/stat.h> -#include <sys/dir.h> +#include <dirent.h> #include <pwd.h> #include <ctype.h> #include <libc.h> @@ -159,7 +159,7 @@ endit: static matchdir(pattern) char *pattern; { - register struct direct *dp; + register struct dirent *dp; DIR *dirp; dirp = opendir(path); diff --git a/usr.sbin/sup/lib/scan.c b/usr.sbin/sup/lib/scan.c index edb42ea..0823e4d 100644 --- a/usr.sbin/sup/lib/scan.c +++ b/usr.sbin/sup/lib/scan.c @@ -28,6 +28,9 @@ ********************************************************************** * HISTORY * $Log: scan.c,v $ + * Revision 1.3 1995/12/26 05:10:59 peter + * Apply ports/net/sup/patches/patch-ab + * * Revision 1.2 1995/12/26 05:02:48 peter * Apply ports/net/sup/patches/patch-aa... * @@ -101,8 +104,8 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/stat.h> -#include <sys/dir.h> #include <sys/file.h> +#include <dirent.h> #include "sup.h" /************************* @@ -711,7 +714,7 @@ listdir (name,always) /* expand directory */ char *name; int always; { - struct direct *dentry; + struct dirent *dentry; register DIR *dirp; char ename[STRINGLENGTH],newname[STRINGLENGTH],filename[STRINGLENGTH]; register char *p,*newp; |
