Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-121

[m6w6/libmemcached] / libmemcached / io.cc

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index 019eafb6e5c9104771f95885d89786d65fda1e2c..886476f6b353301f88f76725357486e38434a431 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -240,7 +240,7 @@ static memcached_return_t io_wait(org::libmemcached::Instance* ptr,
         int local_errno= EINVAL;
         int err;
         socklen_t len= sizeof (err);
-        if (getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+        if (getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, (char*)&err, &len) == 0)
         {
           if (err == 0) // treat this as EINTR
           {