merge from gcc

[deliverable/binutils-gdb.git] / libiberty / regex.c

diff --git a/libiberty/regex.c b/libiberty/regex.c
index f9d9a4e26dce9b3c73f916b8695564c84398b548..e3439b2ff634d044cc1d1b1ef95f06035b8de910 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -8200,7 +8200,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
       if (msg_size > errbuf_size)
         {
 #if defined HAVE_MEMPCPY || defined _LIBC
-         *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+         *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
 #else
           memcpy (errbuf, msg, errbuf_size - 1);
           errbuf[errbuf_size - 1] = 0;