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