diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 17:22:15 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 17:22:15 +0000 |
| commit | d6697c60c378cbb4343abbd42e966366b84a2fb1 (patch) | |
| tree | 51530112c2b86e0227813cfab68d0d523db09a11 | |
| parent | 2b6236d156b394227e41b0d664cf600b69db9403 (diff) | |
| download | coreutils-d6697c60c378cbb4343abbd42e966366b84a2fb1.tar.xz | |
Assume <dirent.h> exists, since gnulib assumes this now as well.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/system.h | 12 |
2 files changed, 8 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2006-07-11 Paul Eggert <eggert@cs.ucla.edu> + + * src/system.h: Assume <dirent.h> exists, since gnulib assumes + this now as well. + 2006-07-09 Jim Meyering <jim@meyering.net> * tests/mv/dir2dir: Adjust so failing with ENOTEMPTY is ok, too. diff --git a/src/system.h b/src/system.h index 6fe212a14..423f0fa8b 100644 --- a/src/system.h +++ b/src/system.h @@ -224,15 +224,9 @@ initialize_exit_failure (int status) # define O_TEXT 0 #endif -#if HAVE_DIRENT_H -# include <dirent.h> -# ifndef _D_EXACT_NAMLEN -# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) -# endif -#else -# define dirent direct -# define _D_EXACT_NAMLEN(dp) (dp)->d_namlen -# include <ndir.h> +#include <dirent.h> +#ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) #endif enum |