Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-18 16:01:23 +00:00
31 changed files with 141 additions and 83 deletions

View File

@ -929,13 +929,13 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
}
void
window_pane_timer_callback(unused int fd, unused short events, void *data)
window_pane_timer_callback(__unused int fd, __unused short events, void *data)
{
window_pane_read_callback(NULL, data);
}
void
window_pane_read_callback(unused struct bufferevent *bufev, void *data)
window_pane_read_callback(__unused struct bufferevent *bufev, void *data)
{
struct window_pane *wp = data;
struct evbuffer *evb = wp->event->input;
@ -981,8 +981,8 @@ start_timer:
}
void
window_pane_error_callback(unused struct bufferevent *bufev, unused short what,
void *data)
window_pane_error_callback(__unused struct bufferevent *bufev,
__unused short what, void *data)
{
struct window_pane *wp = data;