===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/m4/main.c	2001/09/17 08:11:13	1.42
--- src/usr.bin/m4/main.c	2001/09/18 13:44:51	1.43
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.42 2001/09/17 08:11:13 espie Exp $	*/
  /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.43 2001/09/18 13:44:51 espie Exp $	*/
  /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
  
  /*-
***************
*** 47,53 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.42 2001/09/17 08:11:13 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 47,53 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.43 2001/09/18 13:44:51 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 277,287 ****
  {
  	int i;
  
! 	assert(t == token[0]);
  
  	for (i = 1; *++token; i++) {
  		t = gpbc();
! 		if (t == EOF || t != *token) {
  			putback(t);
  			while (--i)
  				putback(*--token);
--- 277,287 ----
  {
  	int i;
  
! 	assert((unsigned char)t == (unsigned char)token[0]);
  
  	for (i = 1; *++token; i++) {
  		t = gpbc();
! 		if (t == EOF || (unsigned char)t != (unsigned char)*token) {
  			putback(t);
  			while (--i)
  				putback(*--token);
***************
*** 291,297 ****
  	return 1;
  }
  
! #define LOOK_AHEAD(t, token) ((t)==(token)[0] && do_look_ahead(t,token))
  
  /*
   * macro - the work horse..
--- 291,299 ----
  	return 1;
  }
  
! #define LOOK_AHEAD(t, token) (t != EOF && 		\
!     (unsigned char)(t)==(unsigned char)(token)[0] && 	\
!     do_look_ahead(t,token))
  
  /*
   * macro - the work horse..