diff options
| -rw-r--r-- | bin/ed/Makefile | 2 | ||||
| -rw-r--r-- | bin/ed/README | 1 | ||||
| -rw-r--r-- | bin/ed/ed.h | 2 | ||||
| -rw-r--r-- | bin/ed/re.c | 7 |
4 files changed, 2 insertions, 10 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile index e247777..5a6a4ea 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,5 +1,5 @@ PROG= ed -CFLAGS+=-DVI_BANG -DGNU_REGEX +CFLAGS+=-DVI_BANG SRCS= ed.c re.c buf.c cbc.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 diff --git a/bin/ed/README b/bin/ed/README index 9dada65..06e302d 100644 --- a/bin/ed/README +++ b/bin/ed/README @@ -7,7 +7,6 @@ compile with little trouble. Otherwise, the macros spl1() and spl0() should be redefined to disable interrupts. The following compiler directives are recognized: -GNU_REGEX - use with GNU regex(3) DES - use to add encryption support (requires crypt(3)) NO_REALLOC_NULL - use if realloc(3) does not accept a NULL pointer BACKWARDS - use for backwards compatibility diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 20d5cec..b390537 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -49,7 +49,7 @@ #define BITS(type) (BITSPERBYTE * (int)sizeof(type)) #define CHARBITS BITS(char) #define INTBITS BITS(int) -#define INTHIBIT (1 << (INTBITS - 1)) +#define INTHIBIT (unsigned) (1 << (INTBITS - 1)) #define ERR (-2) #define EMOD (-3) diff --git a/bin/ed/re.c b/bin/ed/re.c index e944750..3fad099 100644 --- a/bin/ed/re.c +++ b/bin/ed/re.c @@ -84,13 +84,6 @@ optpat() return NULL; } patlock = 0; -#ifdef GNU_REGEX - /* initialize pattern buffer */ - exp->buffer = NULL; - exp->allocated = 0L; - exp->fastmap = 0; /* not used by GNU regex after 0.12 */ - exp->translate = 0; -#endif if (n = regcomp(exp, exps, 0)) { regerror(n, exp, errmsg, sizeof errmsg); return NULL; |
