diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2010-12-24 13:30:22 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2010-12-24 14:34:46 +0000 |
| commit | 88004d6b66f80d72e97e9b6b024842d692e5748a (patch) | |
| tree | 1b7b62665039d737a5b467b128c7097579225212 | |
| parent | 0f41007b7c6fa5ecede17292f1287fb211604ed7 (diff) | |
sysdeps-unix: use #if for HAVE_DECL_MSG_NOSIGNAL
Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>
| -rw-r--r-- | 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 1287f730..7c557571 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 HAVE_DECL_MSG_NOSIGNAL +#if 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 HAVE_DECL_MSG_NOSIGNAL +#if HAVE_DECL_MSG_NOSIGNAL |MSG_NOSIGNAL #endif ); @@ -481,7 +481,7 @@ _dbus_write_socket_two (int fd, int start2, int len2) { -#ifdef HAVE_DECL_MSG_NOSIGNAL +#if 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 HAVE_DECL_MSG_NOSIGNAL +#if HAVE_DECL_MSG_NOSIGNAL |MSG_NOSIGNAL #endif ); #else bytes_written = send (server_fd, buf, 1, 0 -#ifdef HAVE_DECL_MSG_NOSIGNAL +#if HAVE_DECL_MSG_NOSIGNAL |MSG_NOSIGNAL #endif ); |