From e4c43aab3e2a6401376af5a6b39f02dead364e85 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 8 Nov 1994 00:14:50 +0000 Subject: Test HAVE_DIRENT_H, HAVE_SYS_DIR_H, HAVE_NDIR_H instead of DIRENT, SYSDIR, NDIR. --- dir.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index da8abf7..ab55f8f 100644 --- a/dir.c +++ b/dir.c @@ -18,26 +18,26 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "make.h" -#if defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__) +#if defined (POSIX) || defined (HAVE_DIRENT_H) || defined (__GNU_LIBRARY__) #include #ifndef __GNU_LIBRARY__ #define D_NAMLEN(d) strlen((d)->d_name) #else /* GNU C library. */ #define D_NAMLEN(d) ((d)->d_namlen) #endif /* Not GNU C library. */ -#else /* Not POSIX or DIRENT. */ +#else /* Not POSIX or HAVE_DIRENT_H. */ #define direct dirent #define D_NAMLEN(d) ((d)->d_namlen) -#ifdef SYSNDIR +#ifdef HAVE_SYS_NDIR_H #include -#endif /* SYSNDIR */ -#ifdef SYSDIR +#endif /* HAVE_SYS_NDIR_H */ +#ifdef HAVE_SYS_DIR_H #include -#endif /* SYSDIR */ -#ifdef NDIR +#endif /* HAVE_SYS_DIR_H */ +#ifdef HAVE_NDIR_H #include -#endif /* NDIR */ -#endif /* POSIX or DIRENT or __GNU_LIBRARY__. */ +#endif /* HAVE_NDIR_H */ +#endif /* POSIX or HAVE_DIRENT_H or __GNU_LIBRARY__. */ #if defined (POSIX) && !defined (__GNU_LIBRARY__) /* Posix does not require that the d_ino field be present, and some -- cgit v1.2.3