circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Build fixes.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-05-31 16:29:07 +01:00
parent f17ecaa495
commit 113356c848
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
format.c
View File

@ -528,7 +528,7 @@ format_cb_current_command(struct format_tree *ft, struct format_entry *fe)
} }
/* Callback for pane_current_path. */ /* Callback for pane_current_path. */
void static void
format_cb_current_path(struct format_tree *ft, struct format_entry *fe) format_cb_current_path(struct format_tree *ft, struct format_entry *fe)
{ {
struct window_pane *wp = ft->wp; struct window_pane *wp = ft->wp;

5
server-client.c
View File

@ -1066,6 +1066,9 @@ server_client_resize_force(struct window_pane *wp)
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy - 1; ws.ws_row = wp->sy - 1;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
#ifdef __sun
if (errno != EINVAL && errno != ENXIO)
#endif
fatal("ioctl failed"); fatal("ioctl failed");
log_debug("%s: %%%u forcing resize", __func__, wp->id); 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); memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy; ws.ws_row = wp->sy;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
#ifdef __sun #ifdef __sun
/* /*
* Some versions of Solaris apparently can return an error when * 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) if (errno != EINVAL && errno != ENXIO)
#endif #endif
fatal("ioctl failed"); fatal("ioctl failed");
}
wp->flags &= ~PANE_RESIZE; wp->flags &= ~PANE_RESIZE;

2
window-buffer.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vis.h> #include <time.h>
#include "tmux.h" #include "tmux.h"

1
window-client.c
View File

@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "tmux.h" #include "tmux.h"