Merging bzr://localhost/libmemcached/994772 to Build branch

[m6w6/libmemcached] / libmemcached / flush_buffers.cc

diff --git a/libmemcached/flush_buffers.cc b/libmemcached/flush_buffers.cc
index bb3c4dec33d171f6ce46026883e41c467a26991a..58260fc10cb785dc7fe44749f92ddb43aca930db 100644 (file)
--- a/libmemcached/flush_buffers.cc
+++ b/libmemcached/flush_buffers.cc
@@ -48,14 +48,14 @@ memcached_return_t memcached_flush_buffers(memcached_st *memc)
 
     if (instance->write_buffer_offset != 0) 
     {
-      if (instance->fd == -1 &&
+      if (instance->fd == INVALID_SOCKET and
           (ret= memcached_connect(instance)) != MEMCACHED_SUCCESS)
       {
         WATCHPOINT_ERROR(ret);
         return ret;
       }
 
-      if (memcached_io_write(instance, NULL, 0, true) == -1)
+      if (memcached_io_write(instance) == false)
       {
         ret= MEMCACHED_SOME_ERRORS;
       }