diff --git a/ChangeLog b/ChangeLog index 0d4e971da..53d7538d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-11 Paul Eggert + + * src/system.h: Assume exists, since gnulib assumes + this now as well. + 2006-07-09 Jim Meyering * 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 -# 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 +#include +#ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) #endif enum