Fix last patch.

diff --git a/string/bits/string2.h b/string/bits/string2.h
index d81f02fb5d539ea4b620fb50e6f80ce18a9b9060..4bf39e1d95295856756aeecd0e1a1677aeae6006 100644 (file)
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -186,7 +186,8 @@ __STRING2_COPY_TYPE (8);
 
 /* GCC optimizes memset(s, 0, n) but not bzero(s, n).
    The optimization is broken before EGCS 1.1.  */
-# if __GNUC_PREREQ (2, 91)
+# if defined __GNUC__ \
+     && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 90))
 #  define __bzero(s, n) __builtin_memset (s, '\0', n)
 # endif
 

diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index a8105d5b852e14f92d744216d44a002293435cd2..1212fa49a00185dbe993e14725a345bd32d6170c 100644 (file)
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -79,9 +79,9 @@ __wcsrtombs (dst, src, len, ps)
          /* Count the number of bytes.  */
          result += data.__outbuf - buf;
        }
-      while (status == __GCONV_FULL_OUTPUT);
+      while (status == GCONV_FULL_OUTPUT);
 
-      if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
+      if (status == GCONV_OK || status == GCONV_EMPTY_INPUT)
        {
          /* There better should be a NUL byte at the end.  */
          assert (data.__outbuf[-1] == '\0');
@@ -109,8 +109,8 @@ __wcsrtombs (dst, src, len, ps)
 
       /* We have to determine whether the last character converted
         is the NUL character.  */
-      if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
-          || status == __GCONV_FULL_OUTPUT)
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT
+          || status == GCONV_FULL_OUTPUT)
          && data.__outbuf[-1] == '\0')
        {
          assert (data.__outbuf != (unsigned char *) dst);
@@ -122,13 +122,13 @@ __wcsrtombs (dst, src, len, ps)
 
   /* There must not be any problems with the conversion but illegal input
      characters.  */
-  assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
-         || status == __GCONV_ILLEGAL_INPUT
-         || status == __GCONV_INCOMPLETE_INPUT
-         || status == __GCONV_FULL_OUTPUT);
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+         || status == GCONV_ILLEGAL_INPUT
+         || status == GCONV_INCOMPLETE_INPUT
+         || status == GCONV_FULL_OUTPUT);
 
-  if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
-      && status != __GCONV_EMPTY_INPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     {
       result = (size_t) -1;
       __set_errno (EILSEQ);

diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 97a36f8d034bfb54eefd863ad93c709ae70c6467..93e0d6ae11616470dd04a9ed7870e882017bd843 100644 (file)
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -57,8 +57,8 @@ wctob (c)
                                               (const unsigned char *) &inbuf[1],
                                               &dummy, 0);
   /* The conversion failed or the output is too long.  */
-  if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
-       && status != __GCONV_EMPTY_INPUT)
+  if ((status != GCONV_OK && status != GCONV_FULL_OUTPUT
+       && status != GCONV_EMPTY_INPUT)
       || data.__outbuf != (unsigned char *) (buf + 1))
     return EOF;