| 1 |
diff -ruN apache_1.3.33/src/regex/regexec.c apache_1.3.33.new/src/regex/regexec.c |
| 2 |
--- apache_1.3.33/src/regex/regexec.c 1998-09-15 15:47:45.000000000 -0400 |
| 3 |
+++ apache_1.3.33.new/src/regex/regexec.c 2004-11-05 02:05:17.265970608 -0500 |
| 4 |
@@ -21,27 +21,27 @@ |
| 5 |
#endif |
| 6 |
|
| 7 |
/* macros for manipulating states, small version */ |
| 8 |
-#define states long |
| 9 |
+#define states unsigned long |
| 10 |
#define states1 states /* for later use in regexec() decision */ |
| 11 |
-#define CLEAR(v) ((v) = 0) |
| 12 |
-#define SET0(v, n) ((v) &= ~(1 << (n))) |
| 13 |
-#define SET1(v, n) ((v) |= 1 << (n)) |
| 14 |
-#define ISSET(v, n) ((v) & (1 << (n))) |
| 15 |
+#define CLEAR(v) ((v) = 0uL) |
| 16 |
+#define SET0(v, n) ((v) &= ~(1uL << (n))) |
| 17 |
+#define SET1(v, n) ((v) |= 1uL << (n)) |
| 18 |
+#define ISSET(v, n) ((v) & (1uL << (n))) |
| 19 |
#define ASSIGN(d, s) ((d) = (s)) |
| 20 |
#define EQ(a, b) ((a) == (b)) |
| 21 |
#define STATEVARS int dummy /* dummy version */ |
| 22 |
#define STATESETUP(m, n) /* nothing */ |
| 23 |
#define STATETEARDOWN(m) /* nothing */ |
| 24 |
-#define SETUP(v) ((v) = 0) |
| 25 |
-#define onestate int |
| 26 |
-#define INIT(o, n) ((o) = (unsigned)1 << (n)) |
| 27 |
+#define SETUP(v) ((v) = 0uL) |
| 28 |
+#define onestate unsigned long |
| 29 |
+#define INIT(o, n) ((o) = 1uL << (n)) |
| 30 |
#define INC(o) ((o) <<= 1) |
| 31 |
#define ISSTATEIN(v, o) ((v) & (o)) |
| 32 |
/* some abbreviations; note that some of these know variable names! */ |
| 33 |
/* do "if I'm here, I can also be there" etc without branches */ |
| 34 |
-#define FWD(dst, src, n) ((dst) |= ((unsigned)(src)&(here)) << (n)) |
| 35 |
-#define BACK(dst, src, n) ((dst) |= ((unsigned)(src)&(here)) >> (n)) |
| 36 |
-#define ISSETBACK(v, n) ((v) & ((unsigned)here >> (n))) |
| 37 |
+#define FWD(dst, src, n) ((dst) |= ((src)&(here)) << (n)) |
| 38 |
+#define BACK(dst, src, n) ((dst) |= ((src)&(here)) >> (n)) |
| 39 |
+#define ISSETBACK(v, n) ((v) & (here >> (n))) != 0uL |
| 40 |
/* function names */ |
| 41 |
#define SNAMES /* engine.c looks after details */ |
| 42 |
|
Parent Directory
| 
Revision Log