summaryrefslogtreecommitdiff
path: root/regex/regexec.c
diff options
context:
space:
mode:
Diffstat (limited to 'regex/regexec.c')
-rw-r--r--regex/regexec.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/regex/regexec.c b/regex/regexec.c
index a552f5a394..7888d02368 100644
--- a/regex/regexec.c
+++ b/regex/regexec.c
@@ -16,24 +16,22 @@
#include "utils.h"
#include "regex2.h"
-#ifndef NDEBUG
static int nope = 0; /* for use in asserts; shuts lint up */
-#endif
/* macros for manipulating states, small version */
-#define states long
-#define states1 states /* for later use in regexec() decision */
+#define states unsigned
+#define states1 unsigned /* for later use in regexec() decision */
#define CLEAR(v) ((v) = 0)
-#define SET0(v, n) ((v) &= ~(1 << (n)))
-#define SET1(v, n) ((v) |= 1 << (n))
-#define ISSET(v, n) ((v) & (1 << (n)))
+#define SET0(v, n) ((v) &= ~((unsigned)1 << (n)))
+#define SET1(v, n) ((v) |= (unsigned)1 << (n))
+#define ISSET(v, n) ((v) & ((unsigned)1 << (n)))
#define ASSIGN(d, s) ((d) = (s))
#define EQ(a, b) ((a) == (b))
#define STATEVARS int dummy /* dummy version */
#define STATESETUP(m, n) /* nothing */
#define STATETEARDOWN(m) /* nothing */
#define SETUP(v) ((v) = 0)
-#define onestate int
+#define onestate unsigned
#define INIT(o, n) ((o) = (unsigned)1 << (n))
#define INC(o) ((o) <<= 1)
#define ISSTATEIN(v, o) ((v) & (o))