[PATCH] sysdeps-unix: check for HAVE_DECL_MSG_NOSIGNAL
Will Thompson
will.thompson at collabora.co.uk
Thu Dec 16 05:56:04 PST 2010
MSG_NOSIGNAL could theoretically be an enum member or something rather
than an #define, so it's better to check for the flag defined by the
configure check (as is done in dbus-connection.c already).
---
dbus/dbus-sysdeps-unix.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 8688ca2..1287f73 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -204,7 +204,7 @@ _dbus_write_socket (int fd,
int start,
int len)
{
-#ifdef MSG_NOSIGNAL
+#ifdef HAVE_DECL_MSG_NOSIGNAL
const char *data;
int bytes_written;
@@ -442,7 +442,7 @@ _dbus_write_socket_with_unix_fds_two(int fd,
again:
bytes_written = sendmsg (fd, &m, 0
-#ifdef MSG_NOSIGNAL
+#ifdef HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
@@ -481,7 +481,7 @@ _dbus_write_socket_two (int fd,
int start2,
int len2)
{
-#ifdef MSG_NOSIGNAL
+#ifdef HAVE_DECL_MSG_NOSIGNAL
struct iovec vectors[2];
const char *data1;
const char *data2;
@@ -1494,13 +1494,13 @@ write_credentials_byte (int server_fd,
#if defined(HAVE_CMSGCRED)
bytes_written = sendmsg (server_fd, &msg, 0
-#ifdef MSG_NOSIGNAL
+#ifdef HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
#else
bytes_written = send (server_fd, buf, 1, 0
-#ifdef MSG_NOSIGNAL
+#ifdef HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
--
1.7.2.3
--------------050502030201040005050109--
More information about the dbus
mailing list