Use countof, part 4.

* autogen.sh (GNULIB_MODULES_LIBINTL, GNULIB_MODULES_TOOLS_FOR_SRC): Add
stdcountof-h.
* libtextstyle/gnulib-local/modules/moo (Depends-on): Add stdcountof-h.
* gettext-tools/tests/intl-setlocale-1-prg.c: Don't include <stdcountof.h>.
(countof): New macro.

diff --git a/autogen.sh b/autogen.sh
index bfa981e1aabd206c45567e5b587593cdfa36a18d..5b1b447725a803ddabf902a975c6148c34257e69 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -163,6 +163,7 @@ if ! $skip_gnulib; then
     localename
     lock
     manywarnings
+    stdcountof-h
     tsearch
     vasnprintf-posix
     vasnwprintf-posix
@@ -266,6 +267,7 @@ if ! $skip_gnulib; then
     sigprocmask
     spawn-pipe
     stat-time
+    stdcountof-h
     stdio-h
     stdlib-h
     stpcpy

diff --git a/gettext-tools/tests/intl-setlocale-1-prg.c b/gettext-tools/tests/intl-setlocale-1-prg.c
index 945c509d5357707b9d31f4fda8072b56cd706db6..611fd2f2b8fa516522244126173805c0bfffefac 100644 (file)
--- a/gettext-tools/tests/intl-setlocale-1-prg.c
+++ b/gettext-tools/tests/intl-setlocale-1-prg.c
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include <locale.h>
-#include <stdcountof.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -32,6 +31,9 @@
 # include "libgnuintl.h"
 #endif
 
+/* We cannot rely on <stdcountof.h> here.  */
+#define countof(array) ((size_t) (sizeof (array) / sizeof ((array)[0])))
+
 #define N_(string) string
 
 struct data_t

diff --git a/libtextstyle/gnulib-local/modules/moo b/libtextstyle/gnulib-local/modules/moo
index 4c2628b8d943426cb7a5117c66417544d054fbdc..464554fa08174b59918c2d4cbc6645340e2c4eda 100644 (file)
--- a/libtextstyle/gnulib-local/modules/moo
+++ b/libtextstyle/gnulib-local/modules/moo
@@ -7,6 +7,7 @@ lib/moo.h
 m4/moo.m4
 
 Depends-on:
+stdcountof-h
 
 configure.ac:
 gl_MOO