aboutsummaryrefslogtreecommitdiff
path: root/readline/posixdir.h
diff options
context:
space:
mode:
authorElena Zannoni <ezannoni@kwikemart.cygnus.com>2006-04-20 20:05:52 +0000
committerElena Zannoni <ezannoni@kwikemart.cygnus.com>2006-04-20 20:05:52 +0000
commitb585a9fad59f9d0c07681778b97d36b67bd9748d (patch)
treed809e30a40f38fd19b05d2cbd920187e84108432 /readline/posixdir.h
parent84041b4c47edb0461f3b82afb77ca2d81819ebfa (diff)
downloadgdb-FSF.zip
gdb-FSF.tar.gz
gdb-FSF.tar.bz2
import of readlilne 5.1FSF
Diffstat (limited to 'readline/posixdir.h')
-rw-r--r--readline/posixdir.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/readline/posixdir.h b/readline/posixdir.h
index 505e279..91f6d96 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