From 857bb723a26a28ada98ef1e8c23ecdbc16cc1171 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sat, 16 Nov 1996 22:53:45 +0000 Subject: 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 --- gnu/lib/libregex/Makefile | 4 ++-- gnu/lib/libregex/regex.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/lib') diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index 1d59e0da35d9..60f7bdfc1102 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 ded13c56729a..335e5d3fca7f 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 */ /* -- cgit v1.3