projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in solution for lp:581030.
[m6w6/libmemcached]
/
libmemcached
/
io.c
diff --git
a/libmemcached/io.c
b/libmemcached/io.c
index d3c5e4b6546e6b040d231c7536b9f22db608db2f..dedcdaf9e9deff939b1d599255263dae8baa4d30 100644
(file)
--- a/
libmemcached/io.c
+++ b/
libmemcached/io.c
@@
-619,11
+619,7
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
increment_udp_message_id(ptr);
WATCHPOINT_ASSERT(ptr->fd != -1);
increment_udp_message_id(ptr);
WATCHPOINT_ASSERT(ptr->fd != -1);
-#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
- sent_length= send(ptr->fd, local_write_ptr, write_length, 0);
-#else
sent_length= send(ptr->fd, local_write_ptr, write_length, MSG_NOSIGNAL|MSG_DONTWAIT);
sent_length= send(ptr->fd, local_write_ptr, write_length, MSG_NOSIGNAL|MSG_DONTWAIT);
-#endif
if (sent_length == SOCKET_ERROR)
{
ptr->cached_errno= get_socket_errno();
if (sent_length == SOCKET_ERROR)
{
ptr->cached_errno= get_socket_errno();