aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-05-31 16:29:07 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-05-31 16:29:07 +0100
commit113356c8481c792a0d757017dfe574878329171d (patch)
tree111380a1dc13ea6e3a3ab4ad4c1e6c4d733a6db3 /server-client.c
parentf17ecaa49544509e93716a84b6510990ed90ceca (diff)
downloadrtmux-113356c8481c792a0d757017dfe574878329171d.tar.gz
rtmux-113356c8481c792a0d757017dfe574878329171d.tar.bz2
rtmux-113356c8481c792a0d757017dfe574878329171d.zip
Build fixes.
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index aaedebcf..08200529 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1066,6 +1066,9 @@ server_client_resize_force(struct window_pane *wp)
ws.ws_col = wp->sx;
ws.ws_row = wp->sy - 1;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
+#ifdef __sun
+ if (errno != EINVAL && errno != ENXIO)
+#endif
fatal("ioctl failed");
log_debug("%s: %%%u forcing resize", __func__, wp->id);
@@ -1091,6 +1094,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx;
ws.ws_row = wp->sy;
+ if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
#ifdef __sun
/*
* Some versions of Solaris apparently can return an error when
@@ -1101,7 +1105,6 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
if (errno != EINVAL && errno != ENXIO)
#endif
fatal("ioctl failed");
- }
wp->flags &= ~PANE_RESIZE;