projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix m4 warnings, and fix a couple of issues around include files.
[awesomized/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index 8b297a7acaed71215d0c9624f632f91c4909bf7f..fbfb8555e975cb6d164b3b6ba1f5ac4cc7ca6a79 100644
(file)
--- a/
libmemcached/io.cc
+++ b/
libmemcached/io.cc
@@
-81,10
+81,10
@@
static bool repack_input_buffer(memcached_server_write_instance_st ptr)
case EINTR:
continue;
case EINTR:
continue;
+#if EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
case EWOULDBLOCK:
-#ifdef USE_EAGAIN
- case EAGAIN:
#endif
#endif
+ case EAGAIN:
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif
@@
-327,10
+327,11
@@
static bool io_flush(memcached_server_write_instance_st ptr,
{
case ENOBUFS:
continue;
{
case ENOBUFS:
continue;
+
+#if EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
case EWOULDBLOCK:
-#ifdef USE_EAGAIN
- case EAGAIN:
#endif
#endif
+ case EAGAIN:
{
/*
* We may be blocked on write because the input buffer
{
/*
* We may be blocked on write because the input buffer
@@
-416,10
+417,10
@@
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
continue;
case ETIMEDOUT: // OSX
continue;
case ETIMEDOUT: // OSX
+#if EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
case EWOULDBLOCK:
-#ifdef USE_EAGAIN
- case EAGAIN:
#endif
#endif
+ case EAGAIN:
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif
@@
-524,10
+525,10
@@
memcached_return_t memcached_io_slurp(memcached_server_write_instance_st ptr)
continue;
case ETIMEDOUT: // OSX
continue;
case ETIMEDOUT: // OSX
+#if EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
case EWOULDBLOCK:
-#ifdef USE_EAGAIN
- case EAGAIN:
#endif
#endif
+ case EAGAIN:
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif
#ifdef TARGET_OS_LINUX
case ERESTART:
#endif