summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/clock.c4
-rw-r--r--usr.bin/tmux/tmux.h4
-rw-r--r--usr.bin/tmux/window-clock.c5
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/tmux/clock.c b/usr.bin/tmux/clock.c
index 4dec04bda32..f244ba117a3 100644
--- a/usr.bin/tmux/clock.c
+++ b/usr.bin/tmux/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.4 2009/09/10 17:16:24 nicm Exp $ */
+/* $OpenBSD: clock.c,v 1.5 2009/11/26 23:13:47 nicm 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/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 25d222164d5..24c6354b701 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.187 2009/11/26 22:28:24 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.188 2009/11/26 23:13:47 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1408,7 +1408,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/usr.bin/tmux/window-clock.c b/usr.bin/tmux/window-clock.c
index 44bcc5c4549..a61029a5258 100644
--- a/usr.bin/tmux/window-clock.c
+++ b/usr.bin/tmux/window-clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-clock.c,v 1.3 2009/11/26 21:37:13 nicm Exp $ */
+/* $OpenBSD: window-clock.c,v 1.4 2009/11/26 23:13:47 nicm 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");