From 4d333bee2d4e7dd00ab88c754a29eb6c36017319 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 17 Jul 2015 19:04:14 -0500 Subject: [PATCH] rebase the imsg patch --- patches/patch-imsg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/patches/patch-imsg.c b/patches/patch-imsg.c index d842d57..0636c93 100644 --- a/patches/patch-imsg.c +++ b/patches/patch-imsg.c @@ -1,6 +1,6 @@ ---- imsg.orig 2014-12-28 13:24:02.771330936 -0600 -+++ imsg.c 2014-12-28 13:24:35.347331642 -0600 -@@ -70,6 +70,7 @@ +--- imsg.c.orig 2015-07-17 23:57:48.000000000 +0000 ++++ imsg.c 2015-07-17 23:58:57.000000000 +0000 +@@ -71,6 +71,7 @@ return (-1); again: @@ -8,13 +8,11 @@ if (getdtablecount() + imsg_fd_overhead + (CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int) >= getdtablesize()) { -@@ -77,7 +78,8 @@ +@@ -78,6 +79,7 @@ free(ifd); return (-1); } -- +#endif -+ + if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) { if (errno == EMSGSIZE) - goto fail;