From: Brian Aker <brian@tangent.org>
Date: Sun, 12 Aug 2012 22:18:00 +0000 (-0400)
Subject: Fix
X-Git-Tag: 1.0.11~8^2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d0bcf33155307f66b7e5a35f7934735f83665945;p=m6w6%2Flibmemcached

Fix
---

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index dfe69c0b..8d027df2 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -259,6 +259,7 @@ static void set_socket_options(org::libmemcached::Instance* server)
 
     int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDTIMEO,
                           &waittime, (socklen_t)sizeof(struct timeval));
+    (void)error;
     assert(error == 0);
   }
 #endif
@@ -284,11 +285,14 @@ static void set_socket_options(org::libmemcached::Instance* server)
     int set= 1;
     int error= setsockopt(server->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
 
+    assert(error == 0);
+
     // This is not considered a fatal error
     if (error == -1)
     {
-      WATCHPOINT_ERRNO(get_socket_errno());
+#if 0
       perror("setsockopt(SO_NOSIGPIPE)");
+#endif
     }
   }
 #endif