  src/osdep/unix/tcp_unix.c |   78 +++++++++++++++------------------------------
  3 files changed, 28 insertions(+), 52 deletions(-)
 
-diff --git a/src/osdep/unix/os_lnx.c b/src/osdep/unix/os_lnx.c
-index 03fd17d..671bbd6 100644
---- a/src/osdep/unix/os_lnx.c
-+++ b/src/osdep/unix/os_lnx.c
+Index: uw-imap/src/osdep/unix/os_lnx.c
+===================================================================
+--- uw-imap.orig/src/osdep/unix/os_lnx.c	2014-04-24 15:21:50.000000000 +0100
++++ uw-imap/src/osdep/unix/os_lnx.c	2014-06-04 15:24:47.000000000 +0100
 @@ -41,6 +41,7 @@
  extern int errno;		/* just in case */
  #include <pwd.h>

       now = time (0);		/* fake timeout if interrupt & time expired */
       if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0;
     } while ((i < 0) && (errno == EINTR));

   time_t t = time (0);
   blocknotify_t bn = (blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL);
   if (stream->tcpsi < 0) return NIL;
@@ -617,15 +598,12 @@
     time_t now = tl;
     time_t ti = ttmo_read ? now + ttmo_read : 0;
     if (tcpdebug) mm_log ("Reading TCP data",TCPDEBUG);
