S390: Fix building with --disable-mutli-arch [BZ #31196]

[platform/upstream/glibc.git] / debug / wcscat_chk.c

diff --git a/debug/wcscat_chk.c b/debug/wcscat_chk.c
index 2bd7e76..597ab17 100644 (file)
--- a/debug/wcscat_chk.c
+++ b/debug/wcscat_chk.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -14,7 +13,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <wchar.h>
 
@@ -30,7 +29,7 @@ __wcscat_chk (wchar_t *dest, const wchar_t *src, size_t destlen)
   /* Find the end of the string.  */
   do
     {
-      if (__builtin_expect (destlen-- == 0, 0))
+      if (__glibc_unlikely (destlen-- == 0))
        __chk_fail ();
       c = *s1++;
     }
@@ -43,7 +42,7 @@ __wcscat_chk (wchar_t *dest, const wchar_t *src, size_t destlen)
 
   do
     {
-      if (__builtin_expect (destlen-- == 0, 0))
+      if (__glibc_unlikely (destlen-- == 0))
        __chk_fail ();
       c = *s2++;
       *++s1 = c;