From dc57c5bb50b0a0f34fec4b03fd769ad0ed339b2b Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Sat, 28 Nov 2009 14:57:59 +0000
Subject: [PATCH] Sync OpenBSD patchset 573:

This doesn't need to be u_int.
---
 clock.c        | 4 ++--
 tmux.h         | 4 ++--
 window-clock.c | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/clock.c b/clock.c
index 45426828..059b277d 100644
--- a/clock.c
+++ b/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.7 2009-09-11 14:13:52 tcunha Exp $ */
+/* $Id: clock.c,v 1.8 2009-11-28 14:57:59 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -97,7 +97,7 @@ const char clock_table[14][5][5] = {
 };
 
 void
-clock_draw(struct screen_write_ctx *ctx, u_int colour, int style)
+clock_draw(struct screen_write_ctx *ctx, int colour, int style)
 {
 	struct screen		*s = ctx->s;
 	struct grid_cell	 gc;
diff --git a/tmux.h b/tmux.h
index b4f6c52b..7466f7c9 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.525 2009-11-28 14:54:12 tcunha Exp $ */
+/* $Id: tmux.h,v 1.526 2009-11-28 14:57:59 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1407,7 +1407,7 @@ int		 paste_replace(struct paste_stack *, u_int, char *, size_t);
 
 /* clock.c */
 extern const char clock_table[14][5][5];
-void		 clock_draw(struct screen_write_ctx *, u_int, int);
+void		 clock_draw(struct screen_write_ctx *, int, int);
 
 /* cmd.c */
 int		 cmd_pack_argv(int, char **, char *, size_t);
diff --git a/window-clock.c b/window-clock.c
index cb1d78af..a8c4e2ed 100644
--- a/window-clock.c
+++ b/window-clock.c
@@ -1,4 +1,4 @@
-/* $Id: window-clock.c,v 1.9 2009-11-28 14:50:37 tcunha Exp $ */
+/* $Id: window-clock.c,v 1.10 2009-11-28 14:57:59 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -113,8 +113,7 @@ window_clock_draw_screen(struct window_pane *wp)
 {
 	struct window_clock_mode_data	*data = wp->modedata;
 	struct screen_write_ctx	 	 ctx;
-	u_int				 colour;
-	int				 style;
+	int				 colour, style;
 
 	colour = options_get_number(&wp->window->options, "clock-mode-colour");
 	style = options_get_number(&wp->window->options, "clock-mode-style");