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

John Palmieri johnp at kemper.freedesktop.org
Sun Oct 8 09:56:52 PDT 2006


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

Modified Files:
	dbus-sysdeps-util-unix.c 
Log Message:
* configure.in: define _POSIX_PTHREAD_SEMANTICS on solaris
  avoid using dirfd on systems that don't have dirfd 
  (Patch by Brian Cameron <brian dot cameron at sun dot com>) 


Index: dbus-sysdeps-util-unix.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util-unix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-sysdeps-util-unix.c	2 Oct 2006 15:43:48 -0000	1.9
+++ dbus-sysdeps-util-unix.c	8 Oct 2006 16:56:50 -0000	1.10
@@ -507,9 +507,12 @@
 dirent_buf_size(DIR * dirp, size_t *size)
 {
  long name_max;
-#   if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \
-    && defined(_PC_NAME_MAX)
-     name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+#   if defined(HAVE_FPATHCONF) && defined(_PC_NAME_MAX)
+#      if defined(HAVE_DIRFD)
+          name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+#      else
+          name_max = fpathconf(dirp->dd_fd, _PC_NAME_MAX);
+#      endif /* HAVE_DIRFD */
      if (name_max == -1)
 #           if defined(NAME_MAX)
 	     name_max = NAME_MAX;



More information about the dbus-commit mailing list