projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update ddm4 and fix OS symbols.
[awesomized/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index cb8ed5c23199eac47b5665ca6733384216b4ffbb..448cc3255f63529adb2185a13fcda8a0edc860a1 100644
(file)
--- 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:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
TARGET_OS_LINUX
+#ifdef
__linux
case ERESTART:
#endif
break; // No IO is fine, we can just move on
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)
{
assert_msg(active_fd == -1 , "poll() returned an unexpected value");
switch (local_errno)
{
-#ifdef
TARGET_OS_LINUX
+#ifdef
__linux
case ERESTART:
#endif
case EINTR:
case ERESTART:
#endif
case EINTR:
@@
-430,7
+430,7
@@
static memcached_return_t _io_fill(memcached_instance_st* instance)
case EWOULDBLOCK:
#endif
case EAGAIN:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
TARGET_OS_LINUX
+#ifdef
__linux
case ERESTART:
#endif
{
case ERESTART:
#endif
{
@@
-568,7
+568,7
@@
memcached_return_t memcached_io_slurp(memcached_instance_st* instance)
case EWOULDBLOCK:
#endif
case EAGAIN:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
TARGET_OS_LINUX
+#ifdef
__linux
case ERESTART:
#endif
if (memcached_success(io_wait(instance, MEM_READ)))
case ERESTART:
#endif
if (memcached_success(io_wait(instance, MEM_READ)))