assert-h: prefer to ‘verify’

Where it’s easy, prefer ‘static_assert’ to ‘verify’,
as this simplifies the source by removing the need to
include verify.h.  Keep using ‘verify’ if verify.h
is used for other reasons, or if code is shared with glibc.
* lib/alignalloc.c, lib/argmatch.h, lib/c32is-impl.h:
* lib/c32snrtombs.c, lib/c32srtombs.c, lib/exclude.c:
* lib/filevercmp.c, lib/fma.c, lib/i-ring.h, lib/ino-map.c:
* lib/localeinfo.c, lib/malloca.c, lib/mbrtoc32.c, lib/mbrtowc.c:
* lib/mbsinit.c, lib/mbsnrtoc32s.c, lib/mbsrtoc32s.c:
* lib/nanosleep.c, lib/parse-datetime.y, lib/pipe2.c:
* lib/rawmemchr.c, lib/relocwrapper.c, lib/sleep.c:
* lib/stat-w32.c, lib/strerror.c, lib/strtoimax.c:
* lib/utimecmp.c, lib/vasnprintf.c, tests/test-alignof.c:
* tests/test-intprops.c, tests/test-libgmp.c:
* tests/test-limits-h.c, tests/test-locale.c:
* tests/test-pthread.c, tests/test-round2.c:
* tests/test-stdalign.c, tests/test-stddef.c, tests/test-stdio.c:
* tests/test-stdlib.c, tests/test-string.c, tests/test-sys_stat.c:
* tests/test-time.c, tests/test-uchar.c, tests/test-unistd.c:
* tests/test-wchar.c:
Prefer static_assert to verify, and stop including verify.h.
* lib/stat.c: Don’t include verify.h (this include was unnecessary).
* modules/alignalloc, modules/alignof-tests, modules/argmatch:
* modules/c-vasnprintf, modules/c32isalnum, modules/c32isalpha:
* modules/c32isblank, modules/c32iscntrl, modules/c32isdigit:
* modules/c32isgraph, modules/c32islower, modules/c32isprint:
* modules/c32ispunct, modules/c32isspace, modules/c32isupper:
* modules/c32isxdigit, modules/c32snrtombs, modules/c32srtombs:
* modules/exclude, modules/filevercmp, modules/fma, modules/fmaf:
* modules/fmal, modules/fstat, modules/i-ring, modules/ino-map:
* modules/intprops-tests, modules/libgmp-tests:
* modules/limits-h-tests, modules/locale-tests, modules/malloca:
* modules/mbrtoc32, modules/mbrtowc, modules/mbsinit:
* modules/mbsnrtoc32s, modules/mbsrtoc32s, modules/nanosleep:
* modules/parse-datetime, modules/pipe2, modules/pthread-h-tests:
* modules/rawmemchr, modules/relocatable-prog-wrapper:
* modules/round-tests, modules/roundf-tests, modules/sleep:
* modules/stat, modules/stdalign-tests, modules/stdckdint-tests:
* modules/stddef-tests, modules/stdio-tests, modules/stdlib-tests:
* modules/strerror, modules/string-tests, modules/strtoimax:
* modules/strtoumax, modules/sys_stat-tests, modules/time-tests:
* modules/uchar-tests, modules/unistd-tests:
* modules/unistdio/u16-u16-vasnprintf:
* modules/unistdio/u16-vasnprintf:
* modules/unistdio/u32-u32-vasnprintf:
* modules/unistdio/u32-vasnprintf:
* modules/unistdio/u8-u8-vasnprintf:
* modules/unistdio/u8-vasnprintf, modules/unistdio/ulc-vasnprintf:
* modules/utimecmp, modules/vasnprintf, modules/wchar-tests:
Depend on assert-h, not verify.

ChangeLog

@@ -7,6 +7,58 @@
 
 2022-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+	assert-h: prefer to ‘verify’
+	Where it’s easy, prefer ‘static_assert’ to ‘verify’,
+	as this simplifies the source by removing the need to
+	include verify.h.  Keep using ‘verify’ if verify.h
+	is used for other reasons, or if code is shared with glibc.
+	* lib/alignalloc.c, lib/argmatch.h, lib/c32is-impl.h:
+	* lib/c32snrtombs.c, lib/c32srtombs.c, lib/exclude.c:
+	* lib/filevercmp.c, lib/fma.c, lib/i-ring.h, lib/ino-map.c:
+	* lib/localeinfo.c, lib/malloca.c, lib/mbrtoc32.c, lib/mbrtowc.c:
+	* lib/mbsinit.c, lib/mbsnrtoc32s.c, lib/mbsrtoc32s.c:
+	* lib/nanosleep.c, lib/parse-datetime.y, lib/pipe2.c:
+	* lib/rawmemchr.c, lib/relocwrapper.c, lib/sleep.c:
+	* lib/stat-w32.c, lib/strerror.c, lib/strtoimax.c:
+	* lib/utimecmp.c, lib/vasnprintf.c, tests/test-alignof.c:
+	* tests/test-intprops.c, tests/test-libgmp.c:
+	* tests/test-limits-h.c, tests/test-locale.c:
+	* tests/test-pthread.c, tests/test-round2.c:
+	* tests/test-stdalign.c, tests/test-stddef.c, tests/test-stdio.c:
+	* tests/test-stdlib.c, tests/test-string.c, tests/test-sys_stat.c:
+	* tests/test-time.c, tests/test-uchar.c, tests/test-unistd.c:
+	* tests/test-wchar.c:
+	Prefer static_assert to verify, and stop including verify.h.
+	* lib/stat.c: Don’t include verify.h (this include was unnecessary).
+	* modules/alignalloc, modules/alignof-tests, modules/argmatch:
+	* modules/c-vasnprintf, modules/c32isalnum, modules/c32isalpha:
+	* modules/c32isblank, modules/c32iscntrl, modules/c32isdigit:
+	* modules/c32isgraph, modules/c32islower, modules/c32isprint:
+	* modules/c32ispunct, modules/c32isspace, modules/c32isupper:
+	* modules/c32isxdigit, modules/c32snrtombs, modules/c32srtombs:
+	* modules/exclude, modules/filevercmp, modules/fma, modules/fmaf:
+	* modules/fmal, modules/fstat, modules/i-ring, modules/ino-map:
+	* modules/intprops-tests, modules/libgmp-tests:
+	* modules/limits-h-tests, modules/locale-tests, modules/malloca:
+	* modules/mbrtoc32, modules/mbrtowc, modules/mbsinit:
+	* modules/mbsnrtoc32s, modules/mbsrtoc32s, modules/nanosleep:
+	* modules/parse-datetime, modules/pipe2, modules/pthread-h-tests:
+	* modules/rawmemchr, modules/relocatable-prog-wrapper:
+	* modules/round-tests, modules/roundf-tests, modules/sleep:
+	* modules/stat, modules/stdalign-tests, modules/stdckdint-tests:
+	* modules/stddef-tests, modules/stdio-tests, modules/stdlib-tests:
+	* modules/strerror, modules/string-tests, modules/strtoimax:
+	* modules/strtoumax, modules/sys_stat-tests, modules/time-tests:
+	* modules/uchar-tests, modules/unistd-tests:
+	* modules/unistdio/u16-u16-vasnprintf:
+	* modules/unistdio/u16-vasnprintf:
+	* modules/unistdio/u32-u32-vasnprintf:
+	* modules/unistdio/u32-vasnprintf:
+	* modules/unistdio/u8-u8-vasnprintf:
+	* modules/unistdio/u8-vasnprintf, modules/unistdio/ulc-vasnprintf:
+	* modules/utimecmp, modules/vasnprintf, modules/wchar-tests:
+	Depend on assert-h, not verify.
+
 	assert-h: static_assert is a keyword in C23
 	* m4/assert_h.m4 (gl_ASSERT_H): Also test for static_assert
 	keyword a la C23, and define HAVE_C_STATIC_ASSERT if so.

lib/alignalloc.c

@@ -26,7 +26,6 @@
 #include <stdalign.h>
 #include <stdckdint.h>
 #include <stdint.h>
-#include "verify.h"
 
 #if !ALIGNALLOC_VIA_ALIGNED_ALLOC
 # if HAVE_POSIX_MEMALIGN
@@ -37,7 +36,7 @@
    sizeof (void *) is a power of two, which is true on all known platforms.
    This check is here rather than in alignalloc.h to save the compiler
    the trouble of checking it each time alignalloc.h is included.  */
-verify (! (sizeof (void *) & (sizeof (void *) - 1)));
+static_assert (! (sizeof (void *) & (sizeof (void *) - 1)));
 
 # else /* !HAVE_POSIX_MEMALIGN */
 
@@ -62,7 +61,7 @@ address_of_pointer_to_malloced (unsigned char *r)
      for a 0 byte at R - 1.  This approach assumes UCHAR_MAX is large
      enough so that there is room for P; although true on all
      plausible platforms, check the assumption to be safe.  */
-  verify (sizeof (void *) + alignof (void *) - 1 <= UCHAR_MAX);
+  static_assert (sizeof (void *) + alignof (void *) - 1 <= UCHAR_MAX);
 
   return align_down (r - 1 - sizeof (void *), alignof (void *));
 }

lib/argmatch.h

@@ -29,7 +29,6 @@
 
 # include "gettext.h"
 # include "quote.h"
-# include "verify.h"
 
 # ifdef  __cplusplus
 extern "C" {
@@ -41,7 +40,8 @@ extern "C" {
    (argument list ends with a NULL guard).  */
 
 # define ARGMATCH_VERIFY(Arglist, Vallist) \
-    verify (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1)
+    static_assert (ARRAY_CARDINALITY (Arglist) \
+                   == ARRAY_CARDINALITY (Vallist) + 1)
 
 /* Return the index of the element of ARGLIST (NULL terminated) that
    matches with ARG.  If VALLIST is not NULL, then use it to resolve

lib/c32is-impl.h

@@ -37,7 +37,6 @@
 #endif
 
 #include "unictype.h"
-#include "verify.h"
 
 int
 FUNC (wint_t wc)
@@ -96,7 +95,7 @@ FUNC (wint_t wc)
 
 #else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */
   /* char32_t and wchar_t are equivalent.  */
-  verify (sizeof (char32_t) == sizeof (wchar_t));
+  static_assert (sizeof (char32_t) == sizeof (wchar_t));
 
   return WCHAR_FUNC (wc);
 #endif

lib/c32snrtombs.c

@@ -42,9 +42,7 @@ extern mbstate_t _gl_c32srtombs_state;
 #else
 /* char32_t and wchar_t are equivalent.  */
 
-# include "verify.h"
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
-
-verify (sizeof (char32_t) == sizeof (wchar_t));
 
 size_t
 c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len,

lib/c32srtombs.c

@@ -42,9 +42,7 @@ extern mbstate_t _gl_c32srtombs_state;
 #else
 /* char32_t and wchar_t are equivalent.  */
 
-# include "verify.h"
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
-
-verify (sizeof (char32_t) == sizeof (wchar_t));
 
 size_t
 c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps)

lib/exclude.c

@@ -37,7 +37,6 @@
 #include "mbuiter.h"
 #include "fnmatch.h"
 #include "xalloc.h"
-#include "verify.h"
 #include "filename.h"
 
 #if GNULIB_EXCLUDE_SINGLE_THREAD
@@ -55,10 +54,10 @@
 # define FNM_LEADING_DIR 0
 #endif
 
-verify (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS)
+static_assert (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS)
-         & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR
+                & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR
-            | FNM_CASEFOLD | FNM_EXTMATCH))
+                   | FNM_CASEFOLD | FNM_EXTMATCH))
-        == 0);
+               == 0);
 
 
 /* Exclusion patterns are grouped into a singly-linked list of

lib/filevercmp.c

@@ -23,7 +23,6 @@
 #include <c-ctype.h>
 #include <limits.h>
 #include <idx.h>
-#include <verify.h>
 
 /* Return the length of a prefix of S that corresponds to the suffix
    defined by this extended regular expression in the C locale:
@@ -74,7 +73,7 @@ order (char const *s, idx_t pos, idx_t len)
     return -2;
   else
     {
-      verify (UCHAR_MAX <= (INT_MAX - 1 - 2) / 2);
+      static_assert (UCHAR_MAX <= (INT_MAX - 1 - 2) / 2);
       return c + UCHAR_MAX + 1;
     }
 }

lib/fma.c

@@ -32,7 +32,6 @@
 
 #include "float+.h"
 #include "integer_length.h"
-#include "verify.h"
 
 #ifdef USE_LONG_DOUBLE
 # define FUNC fmal
@@ -94,11 +93,11 @@
 
 typedef unsigned int mp_limb_t;
 #define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+static_assert (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
 
 typedef unsigned long long mp_twolimb_t;
 #define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+static_assert (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
 
 /* Number of limbs needed for a single DOUBLE.  */
 #define NLIMBS1 ((MANT_BIT + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS)

lib/i-ring.h

@@ -14,10 +14,9 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#include "verify.h"
 
 enum { I_RING_SIZE = 4 };
-verify (1 <= I_RING_SIZE);
+static_assert (1 <= I_RING_SIZE);
 
 /* When ir_empty is true, the ring is empty.
    Otherwise, ir_data[B..F] are defined, where B..F is the contiguous

lib/ino-map.c

@@ -21,7 +21,6 @@
 #include "ino-map.h"
 
 #include "hash.h"
-#include "verify.h"
 
 #include <limits.h>
 #include <stdlib.h>
@@ -151,7 +150,7 @@ ino_map_insert (struct ino_map *im, ino_t ino)
          overflow to zero, then it must equal INO_MAP_INSERT_FAILURE,
          which is the value that should be returned in that case.
          Verify that this works.  */
-      verify (INO_MAP_INSERT_FAILURE + 1 == 0);
+      static_assert (INO_MAP_INSERT_FAILURE + 1 == 0);
 
       /* Prepare to allocate a new probe next time; this one is in use.  */
       im->probe = NULL;

lib/localeinfo.c

@@ -23,8 +23,6 @@
 
 #include <localeinfo.h>
 
-#include <verify.h>
-
 #include <limits.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -32,7 +30,7 @@
 #include <wctype.h>
 
 /* The sbclen implementation relies on this.  */
-verify (MB_LEN_MAX <= SCHAR_MAX);
+static_assert (MB_LEN_MAX <= SCHAR_MAX);
 
 /* Return true if the locale uses UTF-8.  */
 
@@ -123,8 +121,8 @@ static short const lonesome_lower[] =
 
 /* Verify that the worst case fits.  This is 1 for towupper, 1 for
    towlower, and 1 for each entry in LONESOME_LOWER.  */
-verify (1 + 1 + sizeof lonesome_lower / sizeof *lonesome_lower
+static_assert (1 + 1 + sizeof lonesome_lower / sizeof *lonesome_lower
-        <= CASE_FOLDED_BUFSIZE);
+               <= CASE_FOLDED_BUFSIZE);
 
 /* Find the characters equal to C after case-folding, other than C
    itself, and store them into FOLDED.  Return the number of characters

lib/malloca.c

@@ -24,7 +24,6 @@
 #include <stdckdint.h>
 
 #include "idx.h"
-#include "verify.h"
 
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
@@ -40,7 +39,7 @@
 /* Type for holding very small pointer differences.  */
 typedef unsigned char small_t;
 /* Verify that it is wide enough.  */
-verify (2 * sa_alignment_max - 1 <= (small_t) -1);
+static_assert (2 * sa_alignment_max - 1 <= (small_t) -1);
 
 void *
 mmalloca (size_t n)

lib/mbrtoc32.c

@@ -52,11 +52,10 @@
 
 # endif
 
-# include "verify.h"
 # include "lc-charset-dispatch.h"
 # include "mbtowc-lock.h"
 
-verify (sizeof (mbstate_t) >= 4);
+static_assert (sizeof (mbstate_t) >= 4);
 static char internal_state[4];
 
 size_t

lib/mbrtowc.c

@@ -51,11 +51,10 @@
 # endif
 
 # include "attribute.h"
-# include "verify.h"
 # include "lc-charset-dispatch.h"
 # include "mbtowc-lock.h"
 
-verify (sizeof (mbstate_t) >= 4);
+static_assert (sizeof (mbstate_t) >= 4);
 static char internal_state[4];
 
 size_t

lib/mbsinit.c

@@ -20,7 +20,6 @@
 /* Specification.  */
 #include <wchar.h>
 
-#include "verify.h"
 
 #if GNULIB_defined_mbstate_t
 
@@ -39,7 +38,7 @@
      - In wc -> mb direction, mbstate_t contains no information. In other
        words, it is always in the initial state.  */
 
-verify (sizeof (mbstate_t) >= 4);
+static_assert (sizeof (mbstate_t) >= 4);
 
 int
 mbsinit (const mbstate_t *ps)

lib/mbsnrtoc32s.c

@@ -51,9 +51,7 @@ extern mbstate_t _gl_mbsrtoc32s_state;
 #else
 /* char32_t and wchar_t are equivalent.  */
 
-# include "verify.h"
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
-
-verify (sizeof (char32_t) == sizeof (wchar_t));
 
 size_t
 mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len,

lib/mbsrtoc32s.c

@@ -43,9 +43,7 @@ extern mbstate_t _gl_mbsrtoc32s_state;
 #else
 /* char32_t and wchar_t are equivalent.  */
 
-# include "verify.h"
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
-
-verify (sizeof (char32_t) == sizeof (wchar_t));
 
 size_t
 mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps)

lib/nanosleep.c

@@ -23,7 +23,6 @@
 #include <time.h>
 
 #include "intprops.h"
-#include "verify.h"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -58,7 +57,7 @@ nanosleep (const struct timespec *requested_delay,
 
   {
     /* Verify that time_t is large enough.  */
-    verify (TYPE_MAXIMUM (time_t) / 24 / 24 / 60 / 60);
+    static_assert (TYPE_MAXIMUM (time_t) / 24 / 24 / 60 / 60);
     const time_t limit = 24 * 24 * 60 * 60;
     time_t seconds = requested_delay->tv_sec;
     struct timespec intermediate;

lib/parse-datetime.y

@@ -38,7 +38,6 @@
 #include "idx.h"
 #include "intprops.h"
 #include "timespec.h"
-#include "verify.h"
 #include "strftime.h"
 
 /* There's no need to extend the stack, so there's no need to involve
@@ -94,9 +93,9 @@
 /* Verify that time_t is an integer as POSIX requires, and that every
    time_t value fits in intmax_t.  Please file a bug report if these
    assumptions are false on your platform.  */
-verify (TYPE_IS_INTEGER (time_t));
+static_assert (TYPE_IS_INTEGER (time_t));
-verify (!TYPE_SIGNED (time_t) || INTMAX_MIN <= TYPE_MINIMUM (time_t));
+static_assert (!TYPE_SIGNED (time_t) || INTMAX_MIN <= TYPE_MINIMUM (time_t));
-verify (TYPE_MAXIMUM (time_t) <= INTMAX_MAX);
+static_assert (TYPE_MAXIMUM (time_t) <= INTMAX_MAX);
 
 /* True if N is out of range for time_t.  */
 static bool
@@ -1253,7 +1252,7 @@ enum { TM_YEAR_BUFSIZE = INT_BUFSIZE_BOUND (int) + 1 };
 static char const *
 tm_year_str (int tm_year, char buf[TM_YEAR_BUFSIZE])
 {
-  verify (TM_YEAR_BASE % 100 == 0);
+  static_assert (TM_YEAR_BASE % 100 == 0);
   sprintf (buf, &"-%02d%02d"[-TM_YEAR_BASE <= tm_year],
            abs (tm_year / 100 + TM_YEAR_BASE / 100),
            abs (tm_year % 100));

lib/pipe2.c

@@ -23,7 +23,6 @@
 #include <fcntl.h>
 
 #include "binary-io.h"
-#include "verify.h"
 
 #if GNULIB_defined_O_NONBLOCK
 # include "nonblocking.h"
@@ -95,7 +94,7 @@ pipe2 (int fd[2], int flags)
     }
 # else
   {
-    verify (O_NONBLOCK == 0);
+    static_assert (O_NONBLOCK == 0);
   }
 # endif
 

lib/rawmemchr.c

@@ -26,7 +26,6 @@
 # include <stdalign.h>
 # include <stdint.h>
 
-# include "verify.h"
 
 /* Find the first occurrence of C in S.  */
 void *
@@ -36,7 +35,7 @@ rawmemchr (const void *s, int c_in)
   typedef uintptr_t longword;
   /* If you change the "uintptr_t", you should change UINTPTR_WIDTH to match.
      This verifies that the type does not have padding bits.  */
-  verify (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword));
+  static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword));
 
   const unsigned char *char_ptr;
   unsigned char c = c_in;

lib/relocwrapper.c

@@ -81,7 +81,6 @@
 #include "progname.h"
 #include "relocatable.h"
 #include "c-ctype.h"
-#include "verify.h"
 
 /* Use the system functions, not the gnulib overrides in this file.  */
 #undef fprintf
@@ -142,7 +141,7 @@ add_dotbin (const char *filename)
 /* List of directories that contain the libraries.  */
 static const char *libdirs[] = { LIBDIRS NULL };
 /* Verify that at least one directory is given.  */
-verify (sizeof (libdirs) / sizeof (libdirs[0]) > 1);
+static_assert (sizeof (libdirs) / sizeof (libdirs[0]) > 1);
 
 /* Relocate the list of directories that contain the libraries.  */
 static void

lib/sleep.c

@@ -22,8 +22,6 @@
 
 #include <limits.h>
 
-#include "verify.h"
-
 #if defined _WIN32 && ! defined __CYGWIN__
 
 # define WIN32_LEAN_AND_MEAN  /* avoid including junk */
@@ -56,7 +54,7 @@ unsigned int
 rpl_sleep (unsigned int seconds)
 {
   /* This requires int larger than 16 bits.  */
-  verify (UINT_MAX / 24 / 24 / 60 / 60);
+  static_assert (UINT_MAX / 24 / 24 / 60 / 60);
   const unsigned int limit = 24 * 24 * 60 * 60;
   while (limit < seconds)
     {

lib/stat-w32.c

@@ -50,7 +50,6 @@
 #include "stat-w32.h"
 
 #include "pathmax.h"
-#include "verify.h"
 
 /* Don't assume that UNICODE is not defined.  */
 #undef LoadLibrary
@@ -228,7 +227,7 @@ _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf)
           if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id)))
             {
               buf->st_dev = id.VolumeSerialNumber;
-              verify (sizeof (ino_t) == sizeof (id.FileId));
+              static_assert (sizeof (ino_t) == sizeof (id.FileId));
               memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t));
               goto ino_done;
             }

lib/stat.c

@@ -58,7 +58,6 @@ orig_stat (const char *filename, struct stat *buf)
 #include <string.h>
 #include "filename.h"
 #include "malloca.h"
-#include "verify.h"
 
 #ifdef WINDOWS_NATIVE
 # define WIN32_LEAN_AND_MEAN

lib/strerror.c

@@ -27,7 +27,6 @@
 
 #include "intprops.h"
 #include "strerror-override.h"
-#include "verify.h"
 
 /* Use the system functions, not the gnulib overrides in this file.  */
 #undef sprintf
@@ -55,7 +54,7 @@ strerror (int n)
   if (!msg || !*msg)
     {
       static char const fmt[] = "Unknown error %d";
-      verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
+      static_assert (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
       sprintf (buf, fmt, n);
       errno = EINVAL;
       return buf;

lib/strtoimax.c

@@ -25,8 +25,6 @@
 
 #include <stdlib.h>
 
-#include "verify.h"
-
 #ifdef UNSIGNED
 # ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
@@ -62,8 +60,8 @@ long long int strtoll (char const *, char **, int);
 Int
 Strtoimax (char const *ptr, char **endptr, int base)
 {
-  verify (sizeof (Int) == sizeof (Unsigned long int)
+  static_assert (sizeof (Int) == sizeof (Unsigned long int)
-          || sizeof (Int) == sizeof (Unsigned long long int));
+                 || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))
     return Strtoll (ptr, endptr, base);

lib/utimecmp.c

@@ -33,7 +33,6 @@
 #include "hash.h"
 #include "intprops.h"
 #include "stat-time.h"
-#include "verify.h"
 
 #ifndef MAX
 # define MAX(a, b) ((a) > (b) ? (a) : (b))
@@ -146,7 +145,7 @@ utimecmpat (int dfd, char const *dst_name,
 
      time_t might be unsigned.  */
 
-  verify (TYPE_IS_INTEGER (time_t));
+  static_assert (TYPE_IS_INTEGER (time_t));
 
   /* Destination and source timestamps.  */
   time_t dst_s = dst_stat->st_mtime;

lib/vasnprintf.c

@@ -101,7 +101,6 @@
 #include "xsize.h"
 
 #include "attribute.h"
-#include "verify.h"
 
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
@@ -408,11 +407,11 @@ is_infinite_or_zerol (long double x)
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
+static_assert (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS);
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
+static_assert (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS);
 
 /* Representation of a bignum >= 0.  */
 typedef struct
@@ -2628,7 +2627,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   size_t characters;
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  static_assert (sizeof (TCHAR_T) == 1);
                   TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -2894,7 +2893,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   size_t characters;
 # if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
-                  verify (sizeof (TCHAR_T) == 1);
+                  static_assert (sizeof (TCHAR_T) == 1);
                   TCHAR_T tmpsrc[64]; /* Assume MB_CUR_MAX <= 64.  */
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
@@ -5451,7 +5450,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
                         /* This code assumes that TCHAR_T is 'char'.  */
-                        verify (sizeof (TCHAR_T) == 1);
+                        static_assert (sizeof (TCHAR_T) == 1);
 # if USE_SNPRINTF
                         tmpsrc = (TCHAR_T *) (result + length);
 # else

modules/alignalloc

@@ -7,6 +7,7 @@ lib/alignalloc.c
 m4/alignalloc.m4
 
 Depends-on:
+assert-h
 extensions
 extern-inline
 idx
@@ -14,7 +15,6 @@ posix_memalign
 stdalign
 stdckdint
 stdint
-verify
 
 configure.ac:
 gl_ALIGNALLOC

modules/alignof-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-alignof.c
 
 Depends-on:
-verify
+assert-h
 stdint
 
 configure.ac:
@@ -10,4 +10,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-alignof
 check_PROGRAMS += test-alignof
-

modules/argmatch

@@ -6,6 +6,7 @@ lib/argmatch.h
 lib/argmatch.c
 
 Depends-on:
+assert-h
 c99
 error
 exitfail
@@ -16,7 +17,6 @@ quote
 quotearg
 stdbool
 stdlib
-verify
 
 configure.ac:
 

modules/c-vasnprintf

@@ -22,6 +22,7 @@ m4/math_h.m4
 m4/exponentd.m4
 
 Depends-on:
+assert-h
 attribute
 stdio
 isnand-nolibm
@@ -39,7 +40,6 @@ xsize
 errno
 memchr
 multiarch
-verify
 
 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])

modules/c32isalnum

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alnum
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isalpha

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alpha
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isblank

@@ -14,7 +14,7 @@ iswblank
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-blank
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32iscntrl

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-cntrl
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isdigit

@@ -14,7 +14,7 @@ iswdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-digit
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isgraph

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-graph
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32islower

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-lower
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isprint

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-print
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32ispunct

@@ -14,7 +14,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-punct
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isspace

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-space
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isupper

@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-upper
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32isxdigit

@@ -15,7 +15,7 @@ iswxdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-xdigit
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])

modules/c32snrtombs

@@ -9,7 +9,7 @@ lib/c32srtombs-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 c32rtomb
 wcsnrtombs      [test $SMALL_WCHAR_T = 0]
 

modules/c32srtombs

@@ -9,7 +9,7 @@ lib/c32srtombs-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 c32rtomb
 wcsrtombs       [test $SMALL_WCHAR_T = 0]
 

modules/exclude

@@ -6,6 +6,7 @@ lib/exclude.h
 lib/exclude.c
 
 Depends-on:
+assert-h
 filename
 fnmatch
 fopen-gnu
@@ -15,7 +16,6 @@ mbuiter
 regex
 stdbool
 unlocked-io-internal
-verify
 xalloc
 
 configure.ac:

modules/filevercmp

@@ -6,10 +6,10 @@ lib/filevercmp.h
 lib/filevercmp.c
 
 Depends-on:
+assert-h
 c-ctype
 idx
 stdbool
-verify
 
 configure.ac:
 

modules/fma

@@ -12,7 +12,7 @@ Depends-on:
 math
 float           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 stdbool         [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
-verify          [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
+assert-h        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 isfinite        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 integer_length  [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 frexp           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]

modules/fmaf

@@ -14,7 +14,7 @@ math
 extensions
 float           [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 stdbool         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
-verify          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
+assert-h         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 isfinite        [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 integer_length  [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 frexpf          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]

modules/fmal

@@ -15,7 +15,7 @@ extensions
 fma             [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
 float           [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 stdbool         [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-verify          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+assert-h        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isfinite        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 integer_length  [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]

modules/fstat

@@ -14,7 +14,7 @@ pathmax         [test $REPLACE_FSTAT = 1]
 stat            [test $REPLACE_FSTAT = 1]
 stat-time       [test $REPLACE_FSTAT = 1]
 unistd          [test $REPLACE_FSTAT = 1]
-verify          [test $REPLACE_FSTAT = 1]
+assert-h        [test $REPLACE_FSTAT = 1]
 msvc-nothrow    [test $REPLACE_FSTAT = 1]
 
 configure.ac:

modules/i-ring

@@ -7,8 +7,8 @@ lib/i-ring.c
 m4/i-ring.m4
 
 Depends-on:
+assert-h
 stdbool
-verify
 
 configure.ac:
 gl_I_RING

modules/ino-map

@@ -6,8 +6,8 @@ lib/ino-map.c
 lib/ino-map.h
 
 Depends-on:
+assert-h
 hash
-verify
 
 configure.ac:
 

modules/intprops-tests

@@ -3,9 +3,9 @@ tests/test-intprops.c
 tests/macros.h
 
 Depends-on:
+assert-h
 inttypes
 stdbool
-verify
 
 configure.ac:
 

modules/libgmp-tests

@@ -3,8 +3,8 @@ tests/macros.h
 tests/test-libgmp.c
 
 Depends-on:
+assert-h
 c99
-verify
 
 configure.ac:
 

modules/limits-h-tests

@@ -2,8 +2,8 @@ Files:
 tests/test-limits-h.c
 
 Depends-on:
+assert-h
 extensions
-verify
 limits-h-c++-tests
 
 configure.ac:

modules/locale-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-locale.c
 
 Depends-on:
-verify
+assert-h
 locale-c++-tests
 
 configure.ac:

modules/malloca

@@ -9,10 +9,10 @@ m4/eealloc.m4
 
 Depends-on:
 alloca-opt
+assert-h
 idx
 stdckdint
 stdint
-verify
 xalloc-oversized
 
 configure.ac:

modules/mbrtoc32

@@ -22,9 +22,9 @@ attribute       [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 c99             [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 hard-locale     [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 mbrtowc         [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
+assert-h        [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 localcharset    [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 streq           [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
-verify          [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 
 configure.ac:
 gl_FUNC_MBRTOC32

modules/mbrtowc

@@ -26,9 +26,9 @@ attribute       [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 stdint          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 hard-locale     [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
 mbsinit         [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
+assert-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 localcharset    [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 streq           [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-verify          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC

modules/mbsinit

@@ -9,8 +9,8 @@ m4/mbstate_t.m4
 Depends-on:
 wchar
 extensions
+assert-h        [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 mbrtowc         [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
-verify          [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 
 configure.ac:
 gl_FUNC_MBSINIT

modules/mbsnrtoc32s

@@ -9,7 +9,7 @@ lib/mbsrtoc32s-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 mbrtoc32
 minmax
 strnlen1

modules/mbsrtoc32s

@@ -9,7 +9,7 @@ lib/mbsrtoc32s-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 mbrtoc32
 strnlen1
 mbsrtowcs       [test $SMALL_WCHAR_T = 0]

modules/nanosleep

@@ -9,11 +9,11 @@ Depends-on:
 time
 extensions
 multiarch
+assert-h        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 intprops        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 pselect         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 stdbool         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 sys_select      [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
-verify          [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 
 configure.ac:
 gl_FUNC_NANOSLEEP

modules/parse-datetime

@@ -9,6 +9,7 @@ m4/tm_gmtoff.m4
 m4/parse-datetime.m4
 
 Depends-on:
+assert-h
 bison
 c99
 c-ctype
@@ -26,7 +27,6 @@ time
 time_r
 time_rz
 timegm
-verify
 
 configure.ac:
 gl_PARSE_DATETIME

modules/pipe2

@@ -10,7 +10,7 @@ unistd
 fcntl-h
 binary-io
 extensions
-verify
+assert-h
 
 configure.ac:
 gl_FUNC_PIPE2

modules/pthread-h-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-pthread.c
 
 Depends-on:
-verify
+assert-h
 pthread-h-c++-tests
 
 configure.ac:

modules/rawmemchr

@@ -7,11 +7,11 @@ lib/rawmemchr.valgrind
 m4/rawmemchr.m4
 
 Depends-on:
+assert-h
 extensions
 stdalign
 stdint
 string
-verify
 
 configure.ac:
 gl_FUNC_RAWMEMCHR

modules/relocatable-prog-wrapper

@@ -51,6 +51,7 @@ m4/relocatable-lib.m4
 m4/setenv.m4
 
 Depends-on:
+assert-h
 c99
 double-slash-root
 eloop-threshold
@@ -73,7 +74,6 @@ stdlib
 string
 sys_stat
 unistd
-verify
 xalloc-oversized
 
 configure.ac-early:

modules/round-tests

@@ -8,10 +8,10 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+assert-h
 isnand-nolibm
 stdbool
 stdint
-verify
 
 configure.ac:
 

modules/roundf-tests

@@ -9,12 +9,12 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+assert-h
 ceilf
 floorf
 isnanf-nolibm
 stdbool
 stdint
-verify
 
 configure.ac:
 

modules/sleep

@@ -7,8 +7,8 @@ m4/sleep.m4
 
 Depends-on:
 unistd
+assert-h        [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 stdint          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
-verify          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 
 configure.ac:
 gl_FUNC_SLEEP

modules/stat

@@ -10,12 +10,12 @@ m4/stat.m4
 Depends-on:
 sys_stat
 largefile
+assert-h        [test $REPLACE_STAT = 1]
 filename        [test $REPLACE_STAT = 1]
 malloca         [test $REPLACE_STAT = 1]
 pathmax         [test $REPLACE_STAT = 1]
 stat-time       [test $REPLACE_STAT = 1]
 stdbool         [test $REPLACE_STAT = 1]
-verify          [test $REPLACE_STAT = 1]
 
 configure.ac:
 gl_FUNC_STAT

modules/stdalign-tests

@@ -3,7 +3,7 @@ tests/test-stdalign.c
 tests/macros.h
 
 Depends-on:
-verify
+assert-h
 stdint
 stdalign-c++-tests
 

modules/stdckdint-tests

@@ -4,9 +4,9 @@ tests/test-intprops.c
 tests/test-stdckdint.c
 
 Depends-on:
+assert-h
 inttypes
 stdbool
-verify
 stdckdint-c++-tests
 
 configure.ac:

modules/stddef-tests

@@ -2,8 +2,8 @@ Files:
 tests/test-stddef.c
 
 Depends-on:
+assert-h
 stdalign
-verify
 stddef-c++-tests
 
 configure.ac:

modules/stdio-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-stdio.c
 
 Depends-on:
-verify
+assert-h
 stdio-c++-tests
 fgetc-tests
 fputc-tests

modules/stdlib-tests

@@ -3,7 +3,7 @@ tests/test-stdlib.c
 tests/test-sys_wait.h
 
 Depends-on:
-verify
+assert-h
 stdlib-c++-tests
 
 configure.ac:

modules/strerror

@@ -7,10 +7,10 @@ m4/strerror.m4
 
 Depends-on:
 string
+assert-h         [test $REPLACE_STRERROR = 1]
 errno            [test $REPLACE_STRERROR = 1]
 intprops         [test $REPLACE_STRERROR = 1]
 strerror-override [test $REPLACE_STRERROR = 1]
-verify           [test $REPLACE_STRERROR = 1]
 
 configure.ac:
 gl_FUNC_STRERROR

modules/string-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-string.c
 
 Depends-on:
-verify
+assert-h
 string-c++-tests
 
 configure.ac:

modules/strtoimax

@@ -7,7 +7,7 @@ m4/strtoimax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
+assert-h        [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 stdint          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 strtoll         [{ test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes]
 

modules/strtoumax

@@ -8,7 +8,7 @@ m4/strtoumax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+assert-h        [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
 

modules/sys_stat-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-sys_stat.c
 
 Depends-on:
-verify
+assert-h
 sys_stat-c++-tests
 
 configure.ac:

modules/time-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-time.c
 
 Depends-on:
-verify
+assert-h
 time-c++-tests
 
 configure.ac:

modules/uchar-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-uchar.c
 
 Depends-on:
-verify
+assert-h
 uchar-c++-tests
 
 configure.ac:

modules/unistd-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-unistd.c
 
 Depends-on:
-verify
+assert-h
 unistd-c++-tests
 
 configure.ac:

modules/unistdio/u16-u16-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/u16-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/u32-u32-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/u32-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/u8-u8-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/u8-vasnprintf

@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/unistdio/ulc-vasnprintf

@@ -45,7 +45,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS

modules/utimecmp

@@ -16,7 +16,7 @@ utimensat
 intprops
 stdbool
 stdint
-verify
+assert-h
 
 configure.ac:
 gl_UTIMECMP

modules/vasnprintf

@@ -30,7 +30,7 @@ stdint
 xsize
 errno
 memchr
-verify
+assert-h
 wchar
 
 configure.ac:

modules/wchar-tests

@@ -2,7 +2,7 @@ Files:
 tests/test-wchar.c
 
 Depends-on:
-verify
+assert-h
 wchar-c++-tests
 
 configure.ac:

tests/test-alignof.c

@@ -23,8 +23,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "verify.h"
-
 typedef long double longdouble;
 typedef struct { char a[1]; } struct1;
 typedef struct { char a[2]; } struct2;
@@ -33,7 +31,7 @@ typedef struct { char a[4]; } struct4;
 
 #define CHECK(type) \
   typedef struct { char slot1; type slot2; } type##_helper; \
-  verify (alignof_slot (type) == offsetof (type##_helper, slot2)); \
+  static_assert (alignof_slot (type) == offsetof (type##_helper, slot2)); \
   const int type##_slot_alignment = alignof_slot (type); \
   const int type##_type_alignment = alignof_type (type);