diff -cr dbus-org/dbus/dbus-file-win.c dbus-1.4.0/dbus/dbus-file-win.c
*** dbus-org/dbus/dbus-file-win.c	2010-09-16 14:40:49.943543500 -0700
--- dbus-1.4.0/dbus/dbus-file-win.c	2010-09-16 14:24:50.174004500 -0700
***************
*** 275,281 ****
        goto out;
      }
    if (world_readable)
!     _dbus_make_file_world_readable (tmp_filename_c);
  
    _dbus_verbose ("tmp file %s hnd %p opened\n", tmp_filename_c, hnd);
  
--- 275,281 ----
        goto out;
      }
    if (world_readable)
!     _dbus_make_file_world_readable (&tmp_filename, error);
  
    _dbus_verbose ("tmp file %s hnd %p opened\n", tmp_filename_c, hnd);
  
diff -cr dbus-org/dbus/dbus-sockets-win.h dbus-1.4.0/dbus/dbus-sockets-win.h
*** dbus-org/dbus/dbus-sockets-win.h	2010-09-16 14:40:55.406161700 -0700
--- dbus-1.4.0/dbus/dbus-sockets-win.h	2010-09-16 14:31:45.167228100 -0700
***************
*** 48,54 ****
  #if defined(EPROTONOSUPPORT) || \
      defined(EAFNOSUPPORT) || \
      defined(EWOULDBLOCK)
! #error This does not look like Win32 and the Microsoft C library
  #endif
  
  #define DBUS_SOCKET_IS_INVALID(s) ((SOCKET)(s) == INVALID_SOCKET)
--- 48,55 ----
  #if defined(EPROTONOSUPPORT) || \
      defined(EAFNOSUPPORT) || \
      defined(EWOULDBLOCK)
! // RAH: errno.h on windows does define these constants
! // #error This does not look like Win32 and the Microsoft C library
  #endif
  
  #define DBUS_SOCKET_IS_INVALID(s) ((SOCKET)(s) == INVALID_SOCKET)