summaryrefslogtreecommitdiff
path: root/cmd-line-utils/readline/posixdir.h
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-07-18 17:22:38 -0700
committerjimw@mysql.com <>2005-07-18 17:22:38 -0700
commit7cf58d1f86dbaeed7e88bda6a85b27db180875b2 (patch)
tree8f787c005becfbba10a82a9f9d1fad6130b0b38f /cmd-line-utils/readline/posixdir.h
parent086c3206f0e4236e9645eb41f7171bb172ef37b3 (diff)
downloadmariadb-git-7cf58d1f86dbaeed7e88bda6a85b27db180875b2.tar.gz
Upgrade bundled readline to version 5.0.
Diffstat (limited to 'cmd-line-utils/readline/posixdir.h')
-rw-r--r--cmd-line-utils/readline/posixdir.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/posixdir.h b/cmd-line-utils/readline/posixdir.h
index 505e27954f1..91f6d96111d 100644
--- a/cmd-line-utils/readline/posixdir.h
+++ b/cmd-line-utils/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