diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
| commit | 5ed45c8735ed45385180fdf76546bf0dfacb6cd5 (patch) | |
| tree | 407017ea92745919245da494113d7c1733b41196 /generic/regguts.h | |
| parent | e2c9d2102f48da3b1ef994f059076ffbbb3d0781 (diff) | |
| parent | bf486a2007f9d3d45855d43e623ad85d29bcd0b7 (diff) | |
| download | tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.zip tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.tar.gz tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.tar.bz2 | |
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
Diffstat (limited to 'generic/regguts.h')
| -rw-r--r-- | generic/regguts.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/regguts.h b/generic/regguts.h index b4944dc..b478e4c 100644 --- a/generic/regguts.h +++ b/generic/regguts.h @@ -341,12 +341,12 @@ struct subre { #define CAP 010 /* capturing parens below */ #define BACKR 020 /* back reference below */ #define INUSE 0100 /* in use in final tree */ -#define LOCAL 03 /* bits which may not propagate up */ +#define NOPROP 03 /* bits which may not propagate up */ #define LMIX(f) ((f)<<2) /* LONGER -> MIXED */ #define SMIX(f) ((f)<<1) /* SHORTER -> MIXED */ -#define UP(f) (((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED)) +#define UP(f) (((f)&~NOPROP) | (LMIX(f) & SMIX(f) & MIXED)) #define MESSY(f) ((f)&(MIXED|CAP|BACKR)) -#define PREF(f) ((f)&LOCAL) +#define PREF(f) ((f)&NOPROP) #define PREF2(f1, f2) ((PREF(f1) != 0) ? PREF(f1) : PREF(f2)) #define COMBINE(f1, f2) (UP((f1)|(f2)) | PREF2(f1, f2)) short retry; /* index into retry memory */ |