Strict alias undef around callbacks.

[awesomized/libmemcached] / libmemcached / connect.cc

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 1c4ea913689ca54b513d7a8ded2660c9ca13100a..09cac309fcd8cf8563d17eff814d0d144bf9b4e3 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -212,9 +212,9 @@ static inline void set_socket_nonblocking(memcached_server_st *server)
     do
     {
       rval= fcntl(server->fd, F_SETFL, flags | O_NONBLOCK);
-    } while (rval == -1 && (errno == EINTR || errno == EAGAIN));
+    } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
 
-    unlikely (rval == -1)
+    if (rval == -1)
     {
       memcached_set_errno(*server, errno, NULL);
     }