X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=readline%2Fposixdir.h;h=91f6d96111d07ba1bc6d1ead35e1f2d224c4784b;hb=89a34d1b2cdfdb53540059dfa430e362fb5a27e5;hp=505e27954f1683671ed12b7e1a140fb9ae9e7ba4;hpb=84041b4c47edb0461f3b82afb77ca2d81819ebfa;p=deliverable%2Fbinutils-gdb.git

diff --git a/readline/posixdir.h b/readline/posixdir.h
index 505e27954f..91f6d96111 100644
--- a/readline/posixdir.h
+++ b/readline/posixdir.h
@@ -25,7 +25,11 @@
 
 #if defined (HAVE_DIRENT_H)
 #  include <dirent.h>
-#  define D_NAMLEN(d)   (strlen ((d)->d_name))
+#  if defined (HAVE_STRUCT_DIRENT_D_NAMLEN)
+#    define D_NAMLEN(d)	((d)->d_namlen)
+#  else
+#    define D_NAMLEN(d)   (strlen ((d)->d_name))
+#  endif /* !HAVE_STRUCT_DIRENT_D_NAMLEN */
 #else
 #  if defined (HAVE_SYS_NDIR_H)
 #    include <sys/ndir.h>
@@ -42,11 +46,11 @@
 #  define D_NAMLEN(d)   ((d)->d_namlen)
 #endif /* !HAVE_DIRENT_H */
 
-#if defined (STRUCT_DIRENT_HAS_D_INO) && !defined (STRUCT_DIRENT_HAS_D_FILENO)
+#if defined (HAVE_STRUCT_DIRENT_D_INO) && !defined (HAVE_STRUCT_DIRENT_D_FILENO)
 #  define d_fileno d_ino
 #endif
 
-#if defined (_POSIX_SOURCE) && (!defined (STRUCT_DIRENT_HAS_D_INO) || defined (BROKEN_DIRENT_D_INO))
+#if defined (_POSIX_SOURCE) && (!defined (HAVE_STRUCT_DIRENT_D_INO) || defined (BROKEN_DIRENT_D_INO))
 /* Posix does not require that the d_ino field be present, and some
    systems do not provide it. */
 #  define REAL_DIR_ENTRY(dp) 1