From: Paul Eggert Date: Sat, 6 Feb 2021 00:35:46 +0000 (-0800) Subject: regex: make it easier to merge into glibc X-Git-Tag: v1.0~3095 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=388d94329ca17789f1481d6fc445a8d02161b81a;p=gnulib.git 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 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