===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -c -r1.73 -r1.74
*** src/usr.bin/tmux/tty.c	2009/11/26 21:37:13	1.73
--- src/usr.bin/tmux/tty.c	2009/11/26 22:47:14	1.74
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.73 2009/11/26 21:37:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.74 2009/11/26 22:47:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 36,43 ****
  int	tty_try_256(struct tty *, u_char, const char *);
  int	tty_try_88(struct tty *, u_char, const char *);
  
! void	tty_colours(struct tty *, const struct grid_cell *, int *);
! void	tty_colours_fg(struct tty *, const struct grid_cell *, int *);
  void	tty_colours_bg(struct tty *, const struct grid_cell *);
  
  void	tty_redraw_region(struct tty *, const struct tty_ctx *);
--- 36,43 ----
  int	tty_try_256(struct tty *, u_char, const char *);
  int	tty_try_88(struct tty *, u_char, const char *);
  
! void	tty_colours(struct tty *, const struct grid_cell *, u_char *);
! void	tty_colours_fg(struct tty *, const struct grid_cell *, u_char *);
  void	tty_colours_bg(struct tty *, const struct grid_cell *);
  
  void	tty_redraw_region(struct tty *, const struct tty_ctx *);
***************
*** 1145,1152 ****
  tty_attributes(struct tty *tty, const struct grid_cell *gc)
  {
  	struct grid_cell	*tc = &tty->cell, gc2;
! 	u_char			 changed;
! 	u_int			 new_attr;
  
  	/* If the character is space, don't care about foreground. */
  	if (gc->data == ' ' && !(gc->flags & GRID_FLAG_UTF8)) {
--- 1145,1151 ----
  tty_attributes(struct tty *tty, const struct grid_cell *gc)
  {
  	struct grid_cell	*tc = &tty->cell, gc2;
! 	u_char			 changed, new_attr;
  
  	/* If the character is space, don't care about foreground. */
  	if (gc->data == ' ' && !(gc->flags & GRID_FLAG_UTF8)) {
***************
*** 1217,1223 ****
  }
  
  void
! tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr)
  {
  	struct grid_cell	*tc = &tty->cell;
  	u_char			 fg = gc->fg, bg = gc->bg, flags = gc->flags;
--- 1216,1222 ----
  }
  
  void
! tty_colours(struct tty *tty, const struct grid_cell *gc, u_char *attr)
  {
  	struct grid_cell	*tc = &tty->cell;
  	u_char			 fg = gc->fg, bg = gc->bg, flags = gc->flags;
***************
*** 1284,1290 ****
  }
  
  void
! tty_colours_fg(struct tty *tty, const struct grid_cell *gc, int *attr)
  {
  	struct grid_cell	*tc = &tty->cell;
  	u_char			 fg = gc->fg;
--- 1283,1289 ----
  }
  
  void
! tty_colours_fg(struct tty *tty, const struct grid_cell *gc, u_char *attr)
  {
  	struct grid_cell	*tc = &tty->cell;
  	u_char			 fg = gc->fg;