Update.

	* string/strcoll.c: Use uint32_t instead of u_int32_t.

1998-05-05  Ulrich Drepper  <drepper@cygnus.com>

diff --git a/ChangeLog b/ChangeLog
index 2607270f76aaf675eb1f763c4796d3d110e91a34..14b208c3540dcddb9f8c84baa874dd836b6caa0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-05  Ulrich Drepper  <drepper@cygnus.com>
+
+       * string/strcoll.c: Use uint32_t instead of u_int32_t.
+
 1998-05-05  Ulrich Drepper  <drepper@cygnus.com>
 
        * libio/stdio.h: Fix typo in __REDIRECT.

diff --git a/README-alpha b/README-alpha
index 6ac0dca2c059762968bfa2aa2d8dad24f5c6b9a4..3446a7fd89ca60b11e5c6bffbd3a15da79c55326 100644 (file)
--- a/README-alpha
+++ b/README-alpha
@@ -155,13 +155,13 @@ GETTING HELP, GLIBC DISCUSSIONS, etc
 ------------------------------------
 
 People who want to help with glibc and who test out snapshots regularly should
-get on the libc-alpha@gnu.org mailing list by sending an email to
-libc-alpha-request@gnu.org.  This list is meant (as the name suggests)
+get on the libc-alpha@cygnus.com mailing list by sending an email to
+libc-alpha-request@cygnus.com.  This list is meant (as the name suggests)
 for the discussion of test releases and also reports for them.  People who are
 on this list are welcome to post questions of general interest.
 
 People who are not only willing to test the snapshots but instead really want
-to help developing glibc should contact libc-hacker-request@gnu.org to
+to help developing glibc should contact libc-hacker-request@cygnus.com.org to
 be put on the developers mailing list.  This list is really only meant for
 developers.  No questions about installation problems or other simple topics
 are wanted nor will they be answered.

diff --git a/string/strcoll.c b/string/strcoll.c
index 6b18567e8a5a9c3bc7ba65f3c99c292a0ff9f5db..cc39820fcf064588c082c5dc9457419ff4499060 100644 (file)
--- a/string/strcoll.c
+++ b/string/strcoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -19,6 +19,7 @@
 
 #include <endian.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -57,14 +58,14 @@ STRCOLL (s1, s2, l)
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
   struct locale_data *current = l->__locales[LC_COLLATE];
 # if BYTE_ORDER == BIG_ENDIAN
-  const u_int32_t *collate_table = (const u_int32_t *)
+  const uint32_t *collate_table = (const uint32_t *)
     current->values[_NL_ITEM_INDEX (_NL_COLLATE_TABLE_EB)].string;
-  const u_int32_t *collate_extra = (const u_int32_t *)
+  const uint32_t *collate_extra = (const uint32_t *)
     current->values[_NL_ITEM_INDEX (_NL_COLLATE_EXTRA_EB)].string;
 # elif BYTE_ORDER == LITTLE_ENDIAN
-  const u_int32_t *collate_table = (const u_int32_t *)
+  const uint32_t *collate_table = (const uint32_t *)
     current->values[_NL_ITEM_INDEX (_NL_COLLATE_TABLE_EL)].string;
-  const u_int32_t *collate_extra = (const u_int32_t *)
+  const uint32_t *collate_extra = (const uint32_t *)
     current->values[_NL_ITEM_INDEX (_NL_COLLATE_EXTRA_EL)].string;
 # else
 #  error bizarre byte order
@@ -100,14 +101,14 @@ STRCOLL (s1, s2, l)
        {
          int s1ignore = 0;
          int s2ignore = 0;
-         u_int32_t w1 = 0;
-         u_int32_t w2 = 0;
+         uint32_t w1 = 0;
+         uint32_t w2 = 0;
 
          /* Here we have to check for IGNORE entries.  If these are
             found we count them and go on with the next value.  */
          while (s1run != NULL
                 && ((w1 = s1run->data[pass].value[s1idx])
-                    == (u_int32_t) IGNORE_CHAR))
+                    == (uint32_t) IGNORE_CHAR))
            {
              ++s1ignore;
              if ((forward && ++s1idx >= s1run->data[pass].number)
@@ -129,7 +130,7 @@ STRCOLL (s1, s2, l)
 
          while (s2run != NULL
                 && ((w2 = s2run->data[pass].value[s2idx])
-                    == (u_int32_t) IGNORE_CHAR))
+                    == (uint32_t) IGNORE_CHAR))
            {
              ++s2ignore;
              if ((forward && ++s2idx >= s2run->data[pass].number)