summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-11-02 19:19:08 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-11-02 19:19:08 +0000
commit22623192bacd539306fa22fc2128f7cdf2146ae5 (patch)
tree29f5c3b7c2839cf230557180f96905e57b087d03 /dbus
parent524ddfcb34c2050f008a4797357c5c2abc48ca55 (diff)
* configure.in: Add a check for DIR *dirp->dd_fd
* dbus/dbus-sysdeps-util-unix: if HAVE_DDFD is defined use DIR *dirp->dd_fd else use DIR *dirp->__dd_fd. This takes care of both Solaris and Irix
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-sysdeps-util-unix.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 57c943d2..f57b7807 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -510,8 +510,10 @@ dirent_buf_size(DIR * dirp, size_t *size)
# if defined(HAVE_FPATHCONF) && defined(_PC_NAME_MAX)
# if defined(HAVE_DIRFD)
name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
-# else
+# elif defined(HAVE_DDFD)
name_max = fpathconf(dirp->dd_fd, _PC_NAME_MAX);
+# else
+ name_max = fpathconf(dirp->__dd_fd, _PC_NAME_MAX);
# endif /* HAVE_DIRFD */
if (name_max == -1)
# if defined(NAME_MAX)