summaryrefslogtreecommitdiff
path: root/libmemcached/io.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libmemcached/io.cc')
-rw-r--r--libmemcached/io.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index cb8ed5c2..ba4b3474 100644
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -99,7 +99,7 @@ static bool repack_input_buffer(memcached_instance_st* instance)
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
case ERESTART:
#endif
break; // No IO is fine, we can just move on
@@ -265,7 +265,7 @@ static memcached_return_t io_wait(memcached_instance_st* instance,
assert_msg(active_fd == -1 , "poll() returned an unexpected value");
switch (local_errno)
{
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
case ERESTART:
#endif
case EINTR:
@@ -412,6 +412,11 @@ memcached_return_t memcached_io_wait_for_write(memcached_instance_st* instance)
return io_wait(instance, MEM_WRITE);
}
+memcached_return_t memcached_io_wait_for_read(memcached_instance_st* instance)
+{
+ return io_wait(instance, MEM_READ);
+}
+
static memcached_return_t _io_fill(memcached_instance_st* instance)
{
ssize_t data_read;
@@ -430,7 +435,7 @@ static memcached_return_t _io_fill(memcached_instance_st* instance)
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
case ERESTART:
#endif
{
@@ -568,7 +573,7 @@ memcached_return_t memcached_io_slurp(memcached_instance_st* instance)
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
case ERESTART:
#endif
if (memcached_success(io_wait(instance, MEM_READ)))