From: Jim Meyering <jim@meyering.net>
Date: Sat, 24 Jun 1995 22:02:25 +0000 (+0000)
Subject: merge with 1.12a
X-Git-Tag: textutils-1_12_1~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7981e85eb3546acb2d4d6cd634330d8581ecc9de;p=thirdparty%2Fcoreutils.git

merge with 1.12a
---

diff --git a/lib/regex.c b/lib/regex.c
index 1cf9196967..04919abe25 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -76,7 +76,7 @@ char *realloc ();
    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)
+#if defined (HAVE_STRING_H) || defined (STDC_HEADERS) || defined (_LIBC)
 #include <string.h>
 #ifndef bcmp
 #define bcmp(s1, s2, n)	memcmp ((s1), (s2), (n))