diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1995-01-11 06:14:14 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1995-01-11 06:14:14 +0000 |
| commit | e82aeeb5ef774368d8382505ac72f67b0cd1c5ea (patch) | |
| tree | 32ac197b71bea8c7ad028bebeefe2d8b63a2fa22 /gnu/usr.bin/awk | |
| parent | 712624913e68fa6bd374677aea0e1706a0837227 (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin/awk')
| -rw-r--r-- | gnu/usr.bin/awk/Makefile | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/awk/awk.h | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/awk/dfa.c | 16 |
3 files changed, 5 insertions, 20 deletions
diff --git a/gnu/usr.bin/awk/Makefile b/gnu/usr.bin/awk/Makefile index dad9f5772be3..e211738ad2c2 100644 --- a/gnu/usr.bin/awk/Makefile +++ b/gnu/usr.bin/awk/Makefile @@ -1,13 +1,12 @@ PROG= awk SRCS= main.c eval.c builtin.c msg.c iop.c io.c field.c getopt1.c \ getopt.c array.c \ - node.c version.c re.c awk.c regex.c dfa.c -DPADD= ${LIBM} -LDADD= -lm + node.c version.c re.c awk.c dfa.c CFLAGS+=-I${.CURDIR} -DGAWK CLEANFILES+=awk.c y.tab.h -MAN1= awk.1 +DPADD+= ${LIBGNUREGEX} ${LIBM} +LDADD+= -lgnuregex -lm .include <bsd.prog.mk> #.include "../../usr.bin/Makefile.inc" diff --git a/gnu/usr.bin/awk/awk.h b/gnu/usr.bin/awk/awk.h index 066bf444f9f3..1f0e2c1e7af6 100644 --- a/gnu/usr.bin/awk/awk.h +++ b/gnu/usr.bin/awk/awk.h @@ -173,7 +173,7 @@ extern int getpgrp P((void)); #define GNU_REGEX #ifdef GNU_REGEX -#include "regex.h" +#include "gnuregex.h" #include "dfa.h" typedef struct Regexp { struct re_pattern_buffer pat; diff --git a/gnu/usr.bin/awk/dfa.c b/gnu/usr.bin/awk/dfa.c index 47ad35e9cc2e..ffa161a07a7b 100644 --- a/gnu/usr.bin/awk/dfa.c +++ b/gnu/usr.bin/awk/dfa.c @@ -51,19 +51,6 @@ extern void free(); #define isgraph(C) (isprint(C) && !isspace(C)) #endif -#ifdef isascii -#define ISALPHA(C) (isascii(C) && isalpha(C)) -#define ISUPPER(C) (isascii(C) && isupper(C)) -#define ISLOWER(C) (isascii(C) && islower(C)) -#define ISDIGIT(C) (isascii(C) && isdigit(C)) -#define ISXDIGIT(C) (isascii(C) && isxdigit(C)) -#define ISSPACE(C) (isascii(C) && isspace(C)) -#define ISPUNCT(C) (isascii(C) && ispunct(C)) -#define ISALNUM(C) (isascii(C) && isalnum(C)) -#define ISPRINT(C) (isascii(C) && isprint(C)) -#define ISGRAPH(C) (isascii(C) && isgraph(C)) -#define ISCNTRL(C) (isascii(C) && iscntrl(C)) -#else #define ISALPHA(C) isalpha(C) #define ISUPPER(C) isupper(C) #define ISLOWER(C) islower(C) @@ -75,9 +62,8 @@ extern void free(); #define ISPRINT(C) isprint(C) #define ISGRAPH(C) isgraph(C) #define ISCNTRL(C) iscntrl(C) -#endif -#include "regex.h" +#include "gnuregex.h" #include "dfa.h" #ifdef __STDC__ |