From: Jim Meyering Date: Sun, 18 Oct 2015 02:18:01 +0000 (-0700) Subject: maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp X-Git-Tag: v1.0~6923 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=37c054af09357276eb560990eba1f20cdc489bfc;p=gnulib.git maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp * top/maint.mk (_gl_TS_function_match): This heuristic extern-function- name-extraction regexp mistakenly used \S+, and would mistakenly extract "*F" from "extern int *F()" rather than the desired "F". Use \w+ instead. --- diff --git a/ChangeLog b/ChangeLog index 7dafb8b7f2..81f8cd2cc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-10-17 Jim Meyering + + maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp + * top/maint.mk (_gl_TS_function_match): This heuristic extern-function- + name-extraction regexp mistakenly used \S+, and would mistakenly + extract "*F" from "extern int *F()" rather than the desired "F". + Use \w+ instead. + 2015-10-17 Jim Meyering maint.mk: sc_tight_scope: factor and support OS X diff --git a/top/maint.mk b/top/maint.mk index 6fb6d841f7..4887e5daee 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1600,7 +1600,7 @@ ifeq (a,b) # do not need to be marked. Symbols matching '__.*' are # reserved by the compiler, so are automatically excluded below. _gl_TS_unmarked_extern_functions ?= main usage -_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\S+) *\(/ +_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\w+) *\(/ # If your project uses a macro like "XTERN", then put # the following in cfg.mk to override this default: