merge with 1.12a

diff --git a/lib/regex.c b/lib/regex.c
index 1cf91969670bc71bd750c3271b73535928674f94..04919abe25ca97473930d6efb387762f8e582942 100644 (file)
--- 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))