diff -r -C2 teTeX-1.0.orig/texk/gsftopk/gsftopk.c teTeX-1.0/texk/gsftopk/gsftopk.c
*** teTeX-1.0.orig/texk/gsftopk/gsftopk.c	Thu Apr 22 01:48:11 1999
--- teTeX-1.0/texk/gsftopk/gsftopk.c	Wed Oct 24 15:17:45 2001
***************
*** 407,411 ****
  Boolean		quiet		= False;
  
! struct option {
  	const char	*longname;
  	short		shortname;
--- 407,411 ----
  Boolean		quiet		= False;
  
! struct xxx_option {
  	const char	*longname;
  	short		shortname;
***************
*** 415,419 ****
  };
  
! static	const struct option	options[]	= {
  		{"test",	't',	False,	&test,	True},
  		{"mapline",	0,	True,	&mapline, 0},
--- 415,419 ----
  };
  
! static	const struct xxx_option	options[]	= {
  		{"test",	't',	False,	&test,	True},
  		{"mapline",	0,	True,	&mapline, 0},
***************
*** 1960,1965 ****
  	argp = argv;
  	while (++argp < argv + argc && (*argp)[0] == '-') {
! 	    const struct option *opt_ptr;
! 	    const struct option *opt;
  	    char *arg = *argp + 1;
  
--- 1960,1965 ----
  	argp = argv;
  	while (++argp < argv + argc && (*argp)[0] == '-') {
! 	    const struct xxx_option *opt_ptr;
! 	    const struct xxx_option *opt;
  	    char *arg = *argp + 1;