*** dvi_init.c.orig	Sat Jan 13 19:16:24 1996
--- dvi_init.c	Sat Jan 13 19:17:18 1996
***************
*** 262,268 ****
  	if (iskanjifont(fontp->fontname)) {
  	    fontp->flags |= FONT_KANJI;
  	    fontp->fsize = (float) size_found;
! 	    fontp->set_char_p = set_char2;
  	}
  	else {
  	    fontp->fsize = (float) size_found / 5;
--- 262,268 ----
  	if (iskanjifont(fontp->fontname)) {
  	    fontp->flags |= FONT_KANJI;
  	    fontp->fsize = (float) size_found;
! 	    fontp->set_char_p = (set_char_proc) set_char2;
  	}
  	else {
  	    fontp->fsize = (float) size_found / 5;
*** gf.c.orig	Sat Jan 13 19:17:24 1996
--- gf.c	Sat Jan 13 19:17:46 1996
***************
*** 58,64 ****
  static	void
  read_GF_char(fontp, ch)
  	register struct font *fontp;
! 	ubyte ch;
  {
  	register struct glyph *g;
  	ubyte	cmnd;
--- 58,64 ----
  static	void
  read_GF_char(fontp, ch)
  	register struct font *fontp;
! 	long ch;
  {
  	register struct glyph *g;
  	ubyte	cmnd;
*** pk.c.orig	Sat Jan 13 19:17:57 1996
--- pk.c	Sat Jan 13 19:18:20 1996
***************
*** 107,113 ****
  static	void
  read_PK_char(fontp, ch)
  	register struct font *fontp;
! 	ubyte	ch;
  {
  	int	i, j;
  	int	n;
--- 107,113 ----
  static	void
  read_PK_char(fontp, ch)
  	register struct font *fontp;
! 	long	ch;
  {
  	int	i, j;
  	int	n;
*** xdvi.h.orig	Sat Jan 13 19:18:35 1996
--- xdvi.h	Sat Jan 13 19:38:03 1996
***************
*** 215,221 ****
  
  #if	NeedFunctionPrototypes
  #ifndef	TEXXET
! typedef	long	(*set_char_proc)(WIDEARG(ubyte, int));
  #else	/* TEXXET */
  typedef	void	(*set_char_proc)(WIDEARG(ubyte, int), WIDEARG(ubyte, int));
  #endif	/* TEXXET */
--- 215,221 ----
  
  #if	NeedFunctionPrototypes
  #ifndef	TEXXET
! typedef	long	(*set_char_proc)(WIDEARG(long, int));
  #else	/* TEXXET */
  typedef	void	(*set_char_proc)(WIDEARG(ubyte, int), WIDEARG(ubyte, int));
  #endif	/* TEXXET */
***************
*** 351,357 ****
  #define	NOMAGSTP (-29999)
  
  #if	NeedFunctionPrototypes
! typedef	void (*read_char_proc)(struct font *, WIDEARG(ubyte, int));
  #else
  typedef	void (*read_char_proc)();
  #endif
--- 351,357 ----
  #define	NOMAGSTP (-29999)
  
  #if	NeedFunctionPrototypes
! typedef	void (*read_char_proc)(struct font *, WIDEARG(long, int));
  #else
  typedef	void (*read_char_proc)();
  #endif
***************
*** 536,547 ****
  extern	void	open_dvi_file(void);
  extern	Boolean	check_dvi_file(void);
  #ifndef	TEXXET
! extern	long	set_char(WIDEARG(ubyte, int));
  #if	defined(KANJI) && !defined(ASCIIDNP)
! extern	long	set_char2(int);
  #endif	/* KANJI && !ASCIIDNP */
! extern	long	load_n_set_char(WIDEARG(ubyte, int));
! extern	long	set_vf_char(WIDEARG(ubyte, int));
  #else
  extern	void	set_char(WIDEARG(ubyte, int), WIDEARG(ubyte, int));
  extern	void	load_n_set_char(WIDEARG(ubyte, int), WIDEARG(ubyte, int));
--- 536,547 ----
  extern	void	open_dvi_file(void);
  extern	Boolean	check_dvi_file(void);
  #ifndef	TEXXET
! extern	long	set_char(WIDEARG(long, int));
  #if	defined(KANJI) && !defined(ASCIIDNP)
! extern	long	set_char2(long);
  #endif	/* KANJI && !ASCIIDNP */
! extern	long	load_n_set_char(WIDEARG(long,long));
! extern	long	set_vf_char(long);
  #else
  extern	void	set_char(WIDEARG(ubyte, int), WIDEARG(ubyte, int));
  extern	void	load_n_set_char(WIDEARG(ubyte, int), WIDEARG(ubyte, int));