summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/tmux/paste.c4
-rw-r--r--usr.bin/tmux/window-copy.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/tmux/paste.c b/usr.bin/tmux/paste.c
index f164b715d97..7d4c716642e 100644
--- a/usr.bin/tmux/paste.c
+++ b/usr.bin/tmux/paste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paste.c,v 1.37 2016/10/11 13:45:47 nicm Exp $ */
+/* $OpenBSD: paste.c,v 1.38 2016/10/12 09:07:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -17,10 +17,10 @@
*/
#include <sys/types.h>
-#include <sys/time.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <vis.h>
#include "tmux.h"
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index 876adc45856..9212f0bc471 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.157 2016/10/11 13:21:59 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.158 2016/10/12 09:07:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1069,11 +1069,10 @@ window_copy_write_line(struct window_pane *wp, struct screen_write_ctx *ctx,
struct options *oo = wp->window->options;
struct grid_cell gc;
char hdr[512];
- size_t last, xoff = 0, size = 0;
+ size_t xoff = 0, size = 0;
style_apply(&gc, oo, "mode-style");
- last = screen_size_y(s) - 1;
if (py == 0) {
size = xsnprintf(hdr, sizeof hdr,
"[%u/%u]", data->oy, screen_hsize(data->backing));