intl: Merge from glibc.

Apply commit
2023-02-03  Wilco Dijkstra  <wilco.dijkstra@arm.com>
Replace rawmemchr (s, '\0') with strchr

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 0ed40d6f53db6ce0d556319ec1bda1d60cba9021..de1008475e455bff1e6bd3875f2ecde696dfb107 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1481,11 +1481,7 @@ plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
   p = translation;
   while (index-- > 0)
     {
-#ifdef _LIBC
-      p = __rawmemchr (p, '\0');
-#else
       p = strchr (p, '\0');
-#endif
       /* And skip over the NUL byte.  */
       p++;