Assume <dirent.h> exists, since gnulib assumes this now as well.

diff --git a/ChangeLog b/ChangeLog
index 0d4e971da9a21b30765152e9d8ebbf393a29ca72..53d7538d2e24b28f6acd2e549ee52c92b62ee97d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6fe212a144c57e57e874c868c6095b1c83359cee..423f0fa8b8c90318f42d5f36b7b4a2f93f13aa3d 100644 (file)
--- 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