Attachment 41328 Details for Bug 32540 – patch fixing problem

[patch] patch fixing problem

dbus-05-msg-nosignal.diff (text/plain), 1.44 KB, created by Brian Cameron on 2010-12-20 20:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Cameron

Created: 2010-12-20 20:00:10 UTC

Size: 1.44 KB

patch

obsolete

>--- dbus-1.4.1/dbus/dbus-sysdeps-unix.c-orig	2010-12-20 17:55:04.259246229 -0600
>+++ dbus-1.4.1/dbus/dbus-sysdeps-unix.c	2010-12-20 17:59:16.968341628 -0600
>@@ -206,7 +206,7 @@ _dbus_write_socket (int               fd
>                     int               start,
>                     int               len)
> {
>-#ifdef HAVE_DECL_MSG_NOSIGNAL
>+#ifdef (HAVE_DECL_MSG_NOSIGNAL == 1)
>   const char *data;
>   int bytes_written;
> 
>@@ -444,7 +444,7 @@ _dbus_write_socket_with_unix_fds_two(int
>  again:
> 
>   bytes_written = sendmsg (fd, &m, 0
>-#ifdef HAVE_DECL_MSG_NOSIGNAL
>+#ifdef (HAVE_DECL_MSG_NOSIGNAL == 1)
>                            |MSG_NOSIGNAL
> #endif
>                            );
>@@ -483,7 +483,7 @@ _dbus_write_socket_two (int             
>                         int               start2,
>                         int               len2)
> {
>-#ifdef HAVE_DECL_MSG_NOSIGNAL
>+#ifdef (HAVE_DECL_MSG_NOSIGNAL == 1)
>   struct iovec vectors[2];
>   const char *data1;
>   const char *data2;
>@@ -1496,13 +1496,13 @@ write_credentials_byte (int             
> 
> #if defined(HAVE_CMSGCRED)
>   bytes_written = sendmsg (server_fd, &msg, 0
>-#ifdef HAVE_DECL_MSG_NOSIGNAL
>+#ifdef (HAVE_DECL_MSG_NOSIGNAL == 1)
>                            |MSG_NOSIGNAL
> #endif
>                            );
> #else
>   bytes_written = send (server_fd, buf, 1, 0
>-#ifdef HAVE_DECL_MSG_NOSIGNAL
>+#ifdef (HAVE_DECL_MSG_NOSIGNAL == 1)
>                         |MSG_NOSIGNAL
> #endif
>                         );

Actions: View | Splinter Review

Attachments on bug 32540: 41328

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.