Update.

2000-07-29  Ulrich Drepper  <drepper@redhat.com>

	* locale/langinfo.h: Add entries for extra tables in CTYPE data.
	* locale/programs/ld-ctype.c: Adjust for this.

	* locale/programs/ld-collate.c: Add more alignment checks.
	* locale/string/strcoll.c: Likewise.

2000-07-30  Mark Kettenis  <kettenis@gnu.org>

	* stdio-common/vfprintf.c: Move inclusion of _i18n_number.h
	outside USE_IN_LIBIO block.

1 files changed, 10 insertions, 1 deletions

diff --git a/string/strcoll.c b/string/strcoll.c
index 32d9124421..0df5752e50 100644
--- a/string/strcoll.c
+++ b/string/strcoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -143,6 +143,15 @@ STRCOLL (s1, s2, l)
 #endif
   use_malloc = 0;
 
+  assert (((uintptr_t) table) % sizeof (table[0]) == 0);
+  assert (((uintptr_t) weights) % sizeof (weights[0]) == 0);
+  assert (((uintptr_t) weights) % sizeof (weights[0]) == 0);
+  assert (((uintptr_t) extra) % sizeof (extra[0]) == 0);
+  assert (((uintptr_t) indirect) % sizeof (indirect[0]) == 0);
+#ifdef WIDE_CHAR_VERSION
+  assert (((uintptr_t) names) % sizeof (names[0]) == 0);
+#endif
+
   /* We need this a few times.  */
   s1len = STRLEN (s1);
   s2len = STRLEN (s2);