more cleanup

[awesomized/libmemcached] / contrib / bin / memaslap / ms_conn.c

diff --git a/contrib/bin/memaslap/ms_conn.c b/contrib/bin/memaslap/ms_conn.c
index f4375ae87bea7c318859d550fcd8b19b0991615b..db54d501302a23152c78298dd847fbf1cd411922 100644 (file)
--- a/contrib/bin/memaslap/ms_conn.c
+++ b/contrib/bin/memaslap/ms_conn.c
@@ -31,10 +31,7 @@
 #if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
 #endif
-
-#if defined(HAVE_TIME_H)
-#  include <time.h>
-#endif
+#include <time.h>
 
 #include "ms_setting.h"
 #include "ms_thread.h"
@@ -1454,7 +1451,7 @@ static int ms_try_read_network(ms_conn_t *c) {
       return -1;
     }
     if (res == -1) {
-      if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+      if ((errno == EAGAIN) || (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK))
         break;
       /* Should close on unhandled errors. */
       ms_conn_set_state(c, conn_closing);
@@ -1912,7 +1909,7 @@ static int ms_transmit(ms_conn_t *c) {
       }
       return TRANSMIT_INCOMPLETE;
     }
-    if ((res == -1) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))) {
+    if ((res == -1) && ((errno == EAGAIN) || (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK))) {
       if (!ms_update_event(c, EV_WRITE | EV_PERSIST)) {
         fprintf(stderr, "Couldn't update event.\n");
         ms_conn_set_state(c, conn_closing);