From 1fb1236e9eccc6ce63220a21e60b1f4783c7659e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 15 Jun 1995 16:46:34 +0000 Subject: [PATCH] merge with 1.11.5b --- lib/regex.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/regex.c b/lib/regex.c index a4959ef53..1cf919696 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -62,8 +62,19 @@ char *malloc (); char *realloc (); #endif -/* We used to test for `BSTRING' here, but only GCC and Emacs define - `BSTRING', as far as I know, and neither of them use this code. */ +/* When used in Emacs's lib-src, we need to get bzero and bcopy somehow. + If nothing else has been done, use the method below. */ +#ifdef INHIBIT_STRING_HEADER +#if !(defined (HAVE_BZERO) && defined (HAVE_BCOPY)) +#if !defined (bzero) && !defined (bcopy) +#undef INHIBIT_STRING_HEADER +#endif +#endif +#endif + +/* This is the normal way of making sure we have a bcopy and a bzero. + This is used in most programs--a few other programs avoid this + by defining INHIBIT_STRING_HEADER. */ #ifndef INHIBIT_STRING_HEADER #if HAVE_STRING_H || STDC_HEADERS || defined (_LIBC) #include -- 2.11.0