regex: make it easier to merge into glibc

* lib/regex_internal.h [_LIBC]: Do not include Gnulib’s dynarray.h.

diff --git a/ChangeLog b/ChangeLog
index fdc1076732da622dc339af7a8acd41732085599a..82aa61a04afb74959a2136e7aba09c004374be3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2021-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+       regex: make it easier to merge into glibc
+       * lib/regex_internal.h [_LIBC]: Do not include Gnulib’s dynarray.h.
+
        regex: minor refactoring
        * lib/regexec.c (proceed_next_node): Use more-local decls.
 

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 3fa2bf1aa574124f795bb258e2edec33b4b61c5c..4b0a3efb6491ec2944a9e980c2dcf31a0bc26b2e 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -32,7 +32,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <dynarray.h>
+#ifndef _LIBC
+# include <dynarray.h>
+#endif
+
 #include <intprops.h>
 #include <verify.h>