summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/declared.sh4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a43fcf60c8..11a75d6b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2021-06-19 Bruno Haible <bruno@clisp.org>
+ declared.sh: Allow parsing 'extern "C"' lines.
+ * build-aux/declared.sh: Don't concatenate lines to an 'extern "C" {'
+ line.
+
+2021-06-19 Bruno Haible <bruno@clisp.org>
+
unitypes: Fix trouble caused by installed older versions of unitypes.h.
* modules/unitypes (configure.ac): Define _UC_RESTRICT through config.h.
diff --git a/build-aux/declared.sh b/build-aux/declared.sh
index 204e6287ff..0d3e70dd8d 100755
--- a/build-aux/declared.sh
+++ b/build-aux/declared.sh
@@ -120,11 +120,11 @@ test "$sed_result" = 'aaa' \
# A sed expression that joins 'extern' declarations that are broken over
# several lines.
sed_join_multiline_externs='
-/^extern [^;]*$/{
+/^extern [^;"]*$/{
:a
N
s/\n/ /g
- /^extern [^;]*$/{
+ /^extern [^;"]*$/{
ba
}
}'