dbus/dbus dbus-sysdeps-util-unix.c,1.10,1.11

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv14804/dbus

Modified Files:
	dbus-sysdeps-util-unix.c 
Log Message:
* 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



Index: dbus-sysdeps-util-unix.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util-unix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-sysdeps-util-unix.c	8 Oct 2006 16:56:50 -0000	1.10
+++ dbus-sysdeps-util-unix.c	2 Nov 2006 19:19:08 -0000	1.11
@@ -510,8 +510,10 @@
 #   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)