*** dbus/dbus-sysdeps-unix.c.orig	2010-12-16 07:53:48.000000000 -0600
--- dbus/dbus-sysdeps-unix.c	2011-01-09 19:02:07.000000000 -0600
***************
*** 57,63 ****
  #include <grp.h>
  
! #ifdef HAVE_ERRNO_H
! #include <errno.h>
  #endif
  #ifdef HAVE_WRITEV
  #include <sys/uio.h>
--- 57,75 ----
  #include <grp.h>
  
! // mac os x has no MSG_NOSIGNAL
! // but >= 10.2 comes with SO_NOSIGPIPE
! // SO_NOSIGPIPE is a setsockopt() option
! // and not a send() parameter as MSG_NOSIGNAL
! // OpenBSD has none of the options so we
! // need to ignore SIGPIPE events
! #ifndef MSG_NOSIGNAL
! #define MSG_NOSIGNAL 0
! #ifdef SO_NOSIGPIPE
! #define USE_SO_NOSIGPIPE
! #endif
  #endif
+ 
+ #include <errno.h>
+ 
  #ifdef HAVE_WRITEV
  #include <sys/uio.h>
***************
*** 70,74 ****
  #endif
  #ifdef HAVE_GETPEERUCRED
! #include <ucred.h>
  #endif
  
--- 82,86 ----
  #endif
  #ifdef HAVE_GETPEERUCRED
! #include <sys/ucred.h>
  #endif