diff options
| author | Jim Meyering <jim@meyering.net> | 1995-06-15 16:46:34 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1995-06-15 16:46:34 +0000 |
| commit | f9f17d4b0f5741ea1bde086b1c7cd71ce94bcbef (patch) | |
| tree | 97fee35e737d5e34c0a57e78d80b9f138935711a /lib/regex.c | |
| parent | 33969b2c90082e5214efd1a22416315400788f58 (diff) | |
| download | coreutils-f9f17d4b0f5741ea1bde086b1c7cd71ce94bcbef.tar.xz | |
merge with 1.11.5b
Diffstat (limited to 'lib/regex.c')
| -rw-r--r-- | lib/regex.c | 15 |
1 files 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 <string.h> |