geopt.c, LT new/pthread.c: s/__mempcpy/mempcpy/

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index a709b42..cbdb1fb 100644 (file)
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -222,7 +222,7 @@ exchange (char **argv, struct _getopt_data *d)
        d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
       else
        {
-         memset (__mempcpy (new_str, __getopt_nonoption_flags,
+         memset (mempcpy (new_str, __getopt_nonoption_flags,
                             d->__nonoption_flags_max_len),
                  '\0', top + 1 - d->__nonoption_flags_max_len);
          d->__nonoption_flags_max_len = top + 1;
@@ -328,7 +328,7 @@ _getopt_initialize (attribute_unused int argc, attribute_unused char *const *arg
              if (__getopt_nonoption_flags == NULL)
                d->__nonoption_flags_max_len = -1;
              else
-               memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+               memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
                        '\0', d->__nonoption_flags_max_len - len);
            }
        }

diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c
index ade21dc..941bb66 100644 (file)
--- a/libpthread/linuxthreads/pthread.c
+++ b/libpthread/linuxthreads/pthread.c
@@ -483,7 +483,7 @@ init_one_static_tls (pthread_descr descr, struct link_map *map)
   dtv[map->l_tls_modid].pointer.is_static = true;
 
   /* Initialize the memory.  */
-  memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
+  memset (mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
          '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
 }