Sync OpenBSD patchset 573:

This doesn't need to be u_int.
This commit is contained in:
Tiago Cunha 2009-11-28 14:57:59 +00:00
parent 575510045a
commit dc57c5bb50
3 changed files with 6 additions and 7 deletions

View File

@ -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;

4
tmux.h
View File

@ -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);

View File

@ -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");