From: Bruno Haible Date: Sun, 20 Jun 2021 01:20:08 +0000 (+0200) Subject: declared.sh: Allow parsing 'extern "C"' lines. X-Git-Tag: v1.0~2801 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ebcebf4e327c8cc284f3e87f859fe884efb71931;p=gnulib.git declared.sh: Allow parsing 'extern "C"' lines. * build-aux/declared.sh: Don't concatenate lines to an 'extern "C" {' line. --- diff --git a/ChangeLog b/ChangeLog index a43fcf60c8..11a75d6b08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-06-19 Bruno Haible + + 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 unitypes: Fix trouble caused by installed older versions of unitypes.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 } }'