Attachment 38774 Details for Bug 30035 – patch to build dbus 1.4.0 on windows 7, includes fix to bug 30035

[patch] patch to build dbus 1.4.0 on windows 7, includes fix to bug 30035

dbus-win.patch (text/plain), 1.46 KB, created by richard.a.hankins on 2010-09-17 14:22:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: richard.a.hankins

Created: 2010-09-17 14:22:25 UTC

Size: 1.46 KB

patch

obsolete

>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)

Actions: View | Splinter Review

Attachments on bug 30035: 38774

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.