[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
- [PATCH 01/10] regex: improve comments, Paul Eggert, 2021/02/05
- [PATCH 04/10] regex: make it easier to merge into glibc,
Paul Eggert <=
- [PATCH 05/10] regex-tests: fix typo, Paul Eggert, 2021/02/05
- [PATCH 03/10] regex: minor refactoring, Paul Eggert, 2021/02/05
- [PATCH 10/10] regex: fix comment location, Paul Eggert, 2021/02/05
- [PATCH 08/10] regex: debug check for set member duplicates, Paul Eggert, 2021/02/05
- [PATCH 02/10] regex: avoid undefined behavior, Paul Eggert, 2021/02/05
- [PATCH 06/10] regex: avoid duplicate in espilon closure, Paul Eggert, 2021/02/05
- [PATCH 07/10] regex: fix longstanding backref match bug, Paul Eggert, 2021/02/05
- [PATCH 09/10] regex-tests: add bug 11053 test, Paul Eggert, 2021/02/05