maint.mk: exclude compiler symbols from sc_tight_scope

diff --git a/ChangeLog b/ChangeLog
index 982b868937b95628a5e4c0f7e306e433cf5c5ebe..b723c7314b0dbe64ca412ad780926d34c1359237 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Pádraig Brady <P@draigBrady.com>
+
+       * top/maint.mk (_gl_tight_scope:): Automatically exclude compiler
+       reserved symbols starting with double underscore from the check.
+
 2011-05-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        intprops: add doc

diff --git a/top/maint.mk b/top/maint.mk
index 0f097d12354b66ccec1c2fbd4ca42c4f446ab951..d0d33e4dad49b941ecc24f005142a331c27cfa18 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1362,13 +1362,16 @@ ifeq (a,b)
 # Most functions should have static scope.
 # Any that don't must be marked with `extern', but `main'
 # and `usage' are exceptions: they're always extern, but
-# do not need to be marked.
+# 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 ?= \
   /^(?:extern|XTERN) +(?:void|(?:struct |const |enum )?\S+) +\**(\S+) +\(/
 
 # The second nm|grep checks for file-scope variables with `extern' scope.
 # Without gnulib's progname module, you might put program_name here.
+# Symbols matching `__.*' are reserved by the compiler,
+# so are automatically excluded below.
 _gl_TS_unmarked_extern_vars ?=
 
 # NOTE: the _match variables are perl expressions -- not mere regular
@@ -1391,7 +1394,7 @@ _gl_tight_scope: $(bin_PROGRAMS)
               test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;   \
        hdr=`for f in $(noinst_HEADERS); do                             \
               test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;   \
-       ( printf '^%s$$\n' $(_gl_TS_unmarked_extern_functions);         \
+       ( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_functions);  \
          grep -h -A1 '^extern .*[^;]$$' $$src                          \
            | grep -vE '^(extern |--)' | sed 's/ .*//';                 \
          perl -lne '$(_gl_TS_function_match)'                          \
@@ -1400,7 +1403,7 @@ _gl_tight_scope: $(bin_PROGRAMS)
        nm -e *.$(OBJEXT) | sed -n 's/.* T //p' | grep -Ev -f $$t       \
          && { echo the above functions should have static scope >&2;   \
               exit 1; } || : ;                                         \
-       ( printf '^%s$$\n' $(_gl_TS_unmarked_extern_vars);              \
+       ( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars);       \
          perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"'           \
            $$hdr *.h ) | sort -u > $$t;                                \
        nm -e *.$(OBJEXT) | sed -n 's/.* [BCDGRS] //p'                  \