===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/mandoc/term.h	2015/01/31 00:11:52	1.55
--- src/usr.bin/mandoc/term.h	2015/04/02 23:47:43	1.56
***************
*** 1,15 ****
! /*	$OpenBSD: term.h,v 1.55 2015/01/31 00:11:52 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
   * copyright notice and this permission notice appear in all copies.
   *
!  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
--- 1,15 ----
! /*	$OpenBSD: term.h,v 1.56 2015/04/02 23:47:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
   * copyright notice and this permission notice appear in all copies.
   *
!  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
***************
*** 38,46 ****
  
  #define	TERM_MAXMARGIN	  100000 /* FIXME */
  
  struct	termp;
  
! typedef void	(*term_margin)(struct termp *, const void *);
  
  struct	termp_tbl {
  	int		  width;	/* width in fixed chars */
--- 38,47 ----
  
  #define	TERM_MAXMARGIN	  100000 /* FIXME */
  
+ struct	roff_meta;
  struct	termp;
  
! typedef void	(*term_margin)(struct termp *, const struct roff_meta *);
  
  struct	termp_tbl {
  	int		  width;	/* width in fixed chars */
***************
*** 117,123 ****
  void		  term_word(struct termp *, const char *);
  void		  term_flushln(struct termp *);
  void		  term_begin(struct termp *, term_margin,
! 			term_margin, const void *);
  void		  term_end(struct termp *);
  
  void		  term_setwidth(struct termp *, const char *);
--- 118,124 ----
  void		  term_word(struct termp *, const char *);
  void		  term_flushln(struct termp *);
  void		  term_begin(struct termp *, term_margin,
! 			term_margin, const struct roff_meta *);
  void		  term_end(struct termp *);
  
  void		  term_setwidth(struct termp *, const char *);