===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/m4/main.c	2000/01/11 14:06:11	1.24
--- src/usr.bin/m4/main.c	2000/01/11 14:10:01	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.24 2000/01/11 14:06:11 espie Exp $	*/
  /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.25 2000/01/11 14:10:01 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.24 2000/01/11 14:06:11 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.25 2000/01/11 14:10:01 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 141,147 ****
  
  static void macro __P((void));
  static void initkwds __P((void));
! static ndptr inspect __P((char *));
  static int do_look_ahead __P((int, const char *));
  
  int main __P((int, char *[]));
--- 141,147 ----
  
  static void macro __P((void));
  static void initkwds __P((void));
! static ndptr inspect __P((char, char *));
  static int do_look_ahead __P((int, const char *));
  
  int main __P((int, char *[]));
***************
*** 276,284 ****
  	cycle {
  		t = gpbc();
  		if (t == '_' || isalpha(t)) {
- 			putback(t);
  			s = token;
! 			p = inspect(s);
  			if (p != nil)
  				putback(l = gpbc());
  			if (p == nil || (l != LPAREN && 
--- 276,283 ----
  	cycle {
  		t = gpbc();
  		if (t == '_' || isalpha(t)) {
  			s = token;
! 			p = inspect(t, s);
  			if (p != nil)
  				putback(l = gpbc());
  			if (p == nil || (l != LPAREN && 
***************
*** 451,464 ****
   * combo with lookup to speed things up.
   */
  static ndptr
! inspect(tp) 
  	char *tp;
  {
- 	char c;
  	char *name = tp;
  	char *etp = tp+MAXTOK;
  	ndptr p;
! 	unsigned int h = 0;
  
  	while ((isalnum(c = gpbc()) || c == '_') && tp < etp)
  		h = (h << 5) + h + (*tp++ = c);
--- 450,465 ----
   * combo with lookup to speed things up.
   */
  static ndptr
! inspect(c, tp) 
! 	char c;
  	char *tp;
  {
  	char *name = tp;
  	char *etp = tp+MAXTOK;
  	ndptr p;
! 	unsigned int h;
! 	
! 	h = *tp++ = c;
  
  	while ((isalnum(c = gpbc()) || c == '_') && tp < etp)
  		h = (h << 5) + h + (*tp++ = c);