From 28e58203a7ab14264f8fa450884a89e9ae48025c Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 11 May 2010 08:52:39 -0600 Subject: [PATCH] maint.mk: gnulib doesn't guarantee NSIG Gnulib conditionally defines NSIG to 32 for some platforms. But since NSIG is not mandated by standards, and there are platforms with 64 signals, we should not promise that NSIG is guaranteed. * top/maint.mk (gl_extract_significant_defines_): Exclude NSIG. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ top/maint.mk | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ddf92554..9af20597e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-11 Eric Blake + + maint.mk: gnulib doesn't guarantee NSIG + * top/maint.mk (gl_extract_significant_defines_): Exclude NSIG. + 2010-05-10 Peter O'Gorman test-pwrite.c: Remove unused variable declaration. diff --git a/top/maint.mk b/top/maint.mk index 867e4be5e..54fcbe9b2 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -674,7 +674,9 @@ gl_other_headers_ ?= \ # Perl -lne code to extract "significant" cpp-defined symbols from a # gnulib header file, eliminating a few common false-positives. gl_extract_significant_defines_ = \ - /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/ && $$2 !~ /(?:rpl_|_used_without_)/\ + /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\ + && $$2 !~ /(?:rpl_|_used_without_)/\ + && $$1 !~ /^(NSIG|ATTRIBUTE_NORETURN)/\ and print $$1 # Create a list of regular expressions matching the names @@ -686,7 +688,6 @@ define def_sym_regex perl -lne '$(gl_extract_significant_defines_)' $$f; \ done; \ ) | sort -u \ - | grep -Ev '^ATTRIBUTE_NORETURN' \ | sed 's/^/^ *# *define /;s/$$/\\>/' endef -- 2.11.0