diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
| commit | f17ecaa49544509e93716a84b6510990ed90ceca (patch) | |
| tree | 6b89857ce59fc9330c136961defdcc0923cbff40 /window-clock.c | |
| parent | 9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff) | |
| parent | d60663ea8664d1c71def883bd64d97af3f791f89 (diff) | |
| download | rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.gz rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.bz2 rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
cfg.c
server-client.c
Diffstat (limited to 'window-clock.c')
| -rw-r--r-- | window-clock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/window-clock.c b/window-clock.c index d23ac136..9ecc68a1 100644 --- a/window-clock.c +++ b/window-clock.c @@ -24,7 +24,8 @@ #include "tmux.h" -static struct screen *window_clock_init(struct window_pane *); +static struct screen *window_clock_init(struct window_pane *, + struct cmd_find_state *, struct args *); static void window_clock_free(struct window_pane *); static void window_clock_resize(struct window_pane *, u_int, u_int); static void window_clock_key(struct window_pane *, struct client *, @@ -145,7 +146,8 @@ window_clock_timer_callback(__unused int fd, __unused short events, void *arg) } static struct screen * -window_clock_init(struct window_pane *wp) +window_clock_init(struct window_pane *wp, __unused struct cmd_find_state *fs, + __unused struct args *args) { struct window_clock_mode_data *data; struct screen *s; |