bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 04/10] regex: make it easier to merge into glibc


From: Paul Eggert
Subject: [PATCH 04/10] regex: make it easier to merge into glibc
Date: Fri, 5 Feb 2021 17:25:56 -0800

* 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 fdc107673..82aa61a04 100644
--- 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 3fa2bf1aa..4b0a3efb6 100644
--- 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>
 
-- 
2.27.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]