summaryrefslogtreecommitdiff
path: root/usr.bin/awk/awk.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/awk/awk.h')
-rw-r--r--usr.bin/awk/awk.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/awk/awk.h b/usr.bin/awk/awk.h
index 3a391239334..a1285e5ed90 100644
--- a/usr.bin/awk/awk.h
+++ b/usr.bin/awk/awk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: awk.h,v 1.5 1997/08/25 16:17:09 kstailey Exp $ */
+/* $OpenBSD: awk.h,v 1.6 1999/04/20 17:31:28 millert Exp $ */
/****************************************************************
Copyright (C) Lucent Technologies 1997
All Rights Reserved
@@ -84,7 +84,7 @@ typedef struct Cell {
char *nval; /* name, for variables only */
char *sval; /* string value */
Awkfloat fval; /* value as number */
- unsigned tval; /* type info: STR|NUM|ARR|FCN|FLD|CON|DONTFREE */
+ int tval; /* type info: STR|NUM|ARR|FCN|FLD|CON|DONTFREE */
struct Cell *cnext; /* ptr to next if chained */
} Cell;
@@ -137,7 +137,7 @@ typedef struct Node {
struct Node *nnext;
int lineno;
int nobj;
- struct Node *narg[1]; /* variable: actual size set by calling malloc */
+ struct Node *narg[1]; /* variable: actual size set by calling malloc */
} Node;
#define NIL ((Node *) 0)
@@ -210,7 +210,7 @@ extern int pairstack[], paircnt;
#define NSTATES 32
typedef struct rrow {
- int ltype;
+ long ltype; /* long avoids pointer warnings on 64-bit */
union {
int i;
Node *np;
@@ -220,17 +220,17 @@ typedef struct rrow {
} rrow;
typedef struct fa {
+ uschar gototab[NSTATES][NCHARS];
+ uschar out[NSTATES];
char *restr;
+ int *posns[NSTATES];
int anchor;
int use;
- uschar gototab[NSTATES][NCHARS];
- int *posns[NSTATES];
- uschar out[NSTATES];
int initstat;
int curstat;
int accept;
int reset;
- struct rrow re[1];
+ struct rrow re[1]; /* variable: actual size set by calling malloc */
} fa;