FYI: three maint patches

[Jim Meyering]

I've pushed these three maint patches:

>From d35a931d2daf0b8e8ad79940b99c40dc8ef75317 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 18 Nov 2012 09:16:17 -0800
Subject: [PATCH 1/3] maint: avoid i686-specific syntax-check failure

* cfg.mk (_gl_TS_unmarked_extern_vars): Define.
---
 cfg.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cfg.mk b/cfg.mk
index 2ddf414..943933a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -604,3 +604,8 @@ export _gl_TS_headers = $(srcdir)/cfg.mk
 _gl_TS_dir = .
 _gl_TS_obj_files = src/*.$(OBJEXT)
 _gl_TS_other_headers = src/*.h
+
+# Tell the tight_scope rule about an exceptional "extern" variable.
+# Normally, the rule would detect its declaration, but that uses a
+# different name, __clz_tab.
+_gl_TS_unmarked_extern_vars = factor_clz_tab
--
1.8.0.197.g5a90748


>From 427e63661bf2f282035d0b1b3a94f420a0f19b07 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 18 Nov 2012 09:45:14 -0800
Subject: [PATCH 2/3] maint: correct indentation of W_TYPE_SIZE-defining cpp
 directives

* src/factor.c: Indent cpp directives to reflect their nesting.
---
 src/factor.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/factor.c b/src/factor.c
index 40cce1f..8439262 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -126,13 +126,13 @@
 /* Make definitions for longlong.h to make it do what it can do for us */

 /* bitcount for uintmax_t */
-#if UINTMAX_MAX == UINT32_MAX
-# define W_TYPE_SIZE 32
-#elif UINTMAX_MAX == UINT64_MAX
-# define W_TYPE_SIZE 64
-#elif UINTMAX_MAX == UINT128_MAX
-# define W_TYPE_SIZE 128
-#endif
+# if UINTMAX_MAX == UINT32_MAX
+#  define W_TYPE_SIZE 32
+# elif UINTMAX_MAX == UINT64_MAX
+#  define W_TYPE_SIZE 64
+# elif UINTMAX_MAX == UINT128_MAX
+#  define W_TYPE_SIZE 128
+# endif

 # define UWtype  uintmax_t
 # define UHWtype unsigned long int
--
1.8.0.197.g5a90748


>From 92cadcc8129831a8784c7ccbf75085bae3af0d70 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 18 Nov 2012 09:51:48 -0800
Subject: [PATCH 3/3] maint: reenable accidentally-disabled cppi-check
 syntax-check rule

* cfg.mk (exclude_file_name_regexp--sc_preprocessor_indentation): Fix
typo that disabled the sc_preprocessor_indentation syntax-check rule
by exempting all files.  s/__ll/_ll/  The typo was introduced in
commit v8.19-157-g759ebcb.
---
 cfg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 943933a..38be9c8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -574,7 +574,7 @@ exclude_file_name_regexp--sc_prohibit_tab_based_indentation 
= \
   $(tbi_1)|$(tbi_2)|$(tbi_3)

 exclude_file_name_regexp--sc_preprocessor_indentation = \
-  ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$|$(__ll)
+  ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$|$(_ll)
 exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \
   ^(src/system\.h|tests/du/2g\.sh)$$

--
1.8.0.197.g5a90748