diff options
| author |   Michael Stewart <vericgar@gentoo.org> | 2005-12-09 02:51:56 +0000 |
|---|---|---|
| committer | Michael Stewart <vericgar@gentoo.org> | 2005-12-09 02:51:56 +0000 |
| commit | ba8886909195f3e536893f18f7722c7e71057d37 (patch) | |
| tree | 4ad942b4efbe84a143a17f459df676291f350742 | |
| parent | New patch to fix dbm detection. Fixes bug 95140 (diff) | |
| download | apache-ba8886909195f3e536893f18f7722c7e71057d37.tar.gz apache-ba8886909195f3e536893f18f7722c7e71057d37.tar.bz2 apache-ba8886909195f3e536893f18f7722c7e71057d37.zip | |
Removing amd64 regex patch - included upstream starting with 1.3.34
| -rw-r--r-- | 1.3/patches/03_amd64_regex.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/1.3/patches/03_amd64_regex.patch b/1.3/patches/03_amd64_regex.patch deleted file mode 100644 index 1ca8ca6..0000000 --- a/1.3/patches/03_amd64_regex.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruN apache_1.3.33/src/regex/regexec.c apache_1.3.33.new/src/regex/regexec.c ---- apache_1.3.33/src/regex/regexec.c 1998-09-15 15:47:45.000000000 -0400 -+++ apache_1.3.33.new/src/regex/regexec.c 2004-11-05 02:05:17.265970608 -0500 -@@ -21,27 +21,27 @@ - #endif - - /* macros for manipulating states, small version */ --#define states long -+#define states unsigned long - #define states1 states /* 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 CLEAR(v) ((v) = 0uL) -+#define SET0(v, n) ((v) &= ~(1uL << (n))) -+#define SET1(v, n) ((v) |= 1uL << (n)) -+#define ISSET(v, n) ((v) & (1uL << (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 INIT(o, n) ((o) = (unsigned)1 << (n)) -+#define SETUP(v) ((v) = 0uL) -+#define onestate unsigned long -+#define INIT(o, n) ((o) = 1uL << (n)) - #define INC(o) ((o) <<= 1) - #define ISSTATEIN(v, o) ((v) & (o)) - /* some abbreviations; note that some of these know variable names! */ - /* do "if I'm here, I can also be there" etc without branches */ --#define FWD(dst, src, n) ((dst) |= ((unsigned)(src)&(here)) << (n)) --#define BACK(dst, src, n) ((dst) |= ((unsigned)(src)&(here)) >> (n)) --#define ISSETBACK(v, n) ((v) & ((unsigned)here >> (n))) -+#define FWD(dst, src, n) ((dst) |= ((src)&(here)) << (n)) -+#define BACK(dst, src, n) ((dst) |= ((src)&(here)) >> (n)) -+#define ISSETBACK(v, n) ((v) & (here >> (n))) != 0uL - /* function names */ - #define SNAMES /* engine.c looks after details */ - |