===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/awk.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/awk/awk.h	1999/12/08 23:09:45	1.8
+++ src/usr.bin/awk/awk.h	2001/09/08 00:12:40	1.9
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awk.h,v 1.8 1999/12/08 23:09:45 millert Exp $	*/
+/*	$OpenBSD: awk.h,v 1.9 2001/09/08 00:12:40 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -182,8 +182,7 @@
 #define isexit(n)	((n)->csub == JEXIT)
 #define	isbreak(n)	((n)->csub == JBREAK)
 #define	iscont(n)	((n)->csub == JCONT)
-#define	isnext(n)	((n)->csub == JNEXT)
-#define	isnextfile(n)	((n)->csub == JNEXTFILE)
+#define	isnext(n)	((n)->csub == JNEXT || (n)->csub == JNEXTFILE)
 #define	isret(n)	((n)->csub == JRET)
 #define isrec(n)	((n)->tval & REC)
 #define isfld(n)	((n)->tval & FLD)
@@ -208,7 +207,7 @@
 	union {
 		int i;
 		Node *np;
-		char *up;
+		uschar *up;
 	} lval;		/* because Al stores a pointer in it! */
 	int	*lfollow;
 } rrow;
@@ -216,7 +215,7 @@
 typedef struct fa {
 	uschar	gototab[NSTATES][NCHARS];
 	uschar	out[NSTATES];
-	char	*restr;
+	uschar	*restr;
 	int	*posns[NSTATES];
 	int	anchor;
 	int	use;