diff options
| author | joerg <joerg@FreeBSD.org> | 1996-11-16 22:53:45 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1996-11-16 22:53:45 +0000 |
| commit | bb1c47b9e6df5d3fe1cf2bef80db1ace0e07227d (patch) | |
| tree | d375b656b9d4f9a43c1bae23551307a838ce772f /gnu/lib | |
| parent | ddd4c56592409e81016f0d4519c190e81d13b43d (diff) | |
| download | FreeBSD-src-bb1c47b9e6df5d3fe1cf2bef80db1ace0e07227d.zip FreeBSD-src-bb1c47b9e6df5d3fe1cf2bef80db1ace0e07227d.tar.gz | |
Disable the inclusion of the Posix regexp stuff into libgnuregexp.
We've already got it in libc, but both libraries are incompatible
wrt. their header files and internal data structures. This
incompatibility caused the expr(1) on the fixit floppy to mysteriously
dump core for the colon operator.
Strong 2.2 candidate, since it fixes the usage of MAKEDEV on the fixit
floppy. I'd like to get it reviewed by somebody else though.
Observed by: andreas
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libregex/Makefile | 4 | ||||
| -rw-r--r-- | gnu/lib/libregex/regex.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index 1d59e0d..60f7bdf 100644 --- a/gnu/lib/libregex/Makefile +++ b/gnu/lib/libregex/Makefile @@ -1,8 +1,8 @@ -# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.17 1996/08/12 19:04:23 ache Exp $ +# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.18 1996/08/30 02:12:07 peter Exp $ LIB= gnuregex -CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 +CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1 SRCS= regex.c NOMAN= noman diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c index ded13c5..335e5d3 100644 --- a/gnu/lib/libregex/regex.c +++ b/gnu/lib/libregex/regex.c @@ -4847,6 +4847,7 @@ re_exec (s) /* POSIX.2 functions. Don't define these for Emacs. */ #ifndef emacs +#if !NO_POSIX_COMPAT /* regcomp takes a regular expression as a string and compiles it. @@ -5088,6 +5089,7 @@ regfree (preg) preg->translate = NULL; } +#endif /* !NO_POSIX_COMPAT */ #endif /* not emacs */ /* |
