Fix compiler warnings, missing #include. From Thomas Adam.

4 files changed, 6 insertions, 9 deletions

diff --git a/cmd-queue.c b/cmd-queue.c
index 8bcc9192..b1c0a4eb 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -20,6 +20,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "tmux.h"
 
diff --git a/control-notify.c b/control-notify.c
index 0931c23a..a298cdc5 100644
--- a/control-notify.c
+++ b/control-notify.c
@@ -99,14 +99,12 @@ void
 control_notify_window_unlinked(unused struct session *s, struct window *w)
 {
 	struct client	*c;
-	struct session	*cs;
 	u_int		 i;
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
-		cs = c->session;
 
 		control_write(c, "%%window-close @%u", w->id);
 	}
@@ -136,14 +134,12 @@ void
 control_notify_window_renamed(struct window *w)
 {
 	struct client	*c;
-	struct session	*s;
 	u_int		 i;
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
 			continue;
-		s = c->session;
 
 		control_write(c, "%%window-renamed @%u %s", w->id, w->name);
 	}
diff --git a/control.c b/control.c
index e78186e4..8986f5c6 100644
--- a/control.c
+++ b/control.c
@@ -22,6 +22,7 @@
 #include <event.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "tmux.h"
 
diff --git a/window.c b/window.c
index 0f445edc..3b6b74bd 100644
--- a/window.c
+++ b/window.c
@@ -496,19 +496,18 @@ window_zoom(struct window_pane *wp)
 int
 window_unzoom(struct window *w)
 {
-	struct window_pane	*wp, *wp1;
+	struct window_pane	*wp;
 
 	if (!(w->flags & WINDOW_ZOOMED))
 		return (-1);
-	wp = w->active;
 
 	w->flags &= ~WINDOW_ZOOMED;
 	layout_free(w);
 	w->layout_root = w->saved_layout_root;
 
-	TAILQ_FOREACH(wp1, &w->panes, entry) {
-		wp1->layout_cell = wp1->saved_layout_cell;
-		wp1->saved_layout_cell = NULL;
+	TAILQ_FOREACH(wp, &w->panes, entry) {
+		wp->layout_cell = wp->saved_layout_cell;
+		wp->saved_layout_cell = NULL;
 	}
 	layout_fix_panes(w, w->sx, w->sy);