X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdo.cc;h=ffb9a48b54d792f0a8daff1d80e3fff4dc60700a;hb=f12b5cdb0754dea2e3d55cea21ad25c7152e54cc;hp=61a143b888d798ace2a3361a63db912ab183b9a7;hpb=146cc15e812ae3d737b1cc49d56cfdbaaf915440;p=awesomized%2Flibmemcached

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 61a143b8..ffb9a48b 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,7 +11,7 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+memcached_return_t memcached_vdo(org::libmemcached::Instance* instance,
                                  libmemcached_io_vector_st vector[],
                                  const size_t count,
                                  const bool with_flush)
@@ -23,7 +23,7 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
   if (memcached_failed(rc= memcached_connect(instance)))
   {
     WATCHPOINT_ERROR(rc);
-    assert_msg(instance->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
+    assert_msg(instance->error_messages, "memcached_connect() returned an error but the Instance showed none.");
     return rc;
   }
 
@@ -34,6 +34,7 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
   **/
   if (memcached_is_udp(instance->root))
   {
+#ifndef __MINGW32__
     if (vector[0].buffer or vector[0].length)
     {
       return memcached_set_error(*instance->root, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT, 
@@ -48,7 +49,11 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
     vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
 
     msg.msg_iov= (struct iovec*)vector;
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+    msg.msg_iovlen= int(count);
+#else
     msg.msg_iovlen= count;
+#endif
 
     uint32_t retry= 5;
     while (--retry)
@@ -70,6 +75,9 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
     }
 
     return MEMCACHED_SUCCESS;
+#else
+    return MEMCACHED_FAILURE;
+#endif
   }
 
   bool sent_success= memcached_io_writev(instance, vector, count, with_flush);