From 388d94329ca17789f1481d6fc445a8d02161b81a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 5 Feb 2021 16:35:46 -0800 Subject: [PATCH] regex: make it easier to merge into glibc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * lib/regex_internal.h [_LIBC]: Do not include Gnulib’s dynarray.h. --- ChangeLog | 3 +++ lib/regex_internal.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fdc1076732..82aa61a04a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2021-02-05 Paul Eggert + 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 3fa2bf1aa5..4b0a3efb64 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -32,7 +32,10 @@ #include #include -#include +#ifndef _LIBC +# include +#endif + #include #include -- 2.39.5