@@ -302,7 +302,7 @@ _dl_load_cache_lookup (const char *name)
  char *temp;
  temp = alloca (strlen (best) + 1);
  strcpy (temp, best);
-Â return strdup (temp);
+Â return __strdup (temp);
 }
Â
 #ifndef MAP_COPY
@@ -149,7 +149,7 @@ rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser,
Â
        if (res->ai_canonname){
                free (ahostbuf);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â ahostbuf = strdup (res->ai_canonname);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â ahostbuf = __strdup (res->ai_canonname);
                if (ahostbuf == NULL) {
                        __fxprintf(NULL, "%s",
                                   _("rcmd: Cannot allocate memory\n"));
@@ -73,7 +73,7 @@ rexec_af (char **ahost, int rport, const char *name, const char *pass,
Â
        if (res0->ai_canonname){
                free (ahostbuf);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â ahostbuf = strdup (res0->ai_canonname);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â ahostbuf = __strdup (res0->ai_canonname);
                if (ahostbuf == NULL) {
                        perror ("rexec: strdup");
                        return (-1);
@@ -131,6 +131,7 @@ extern int errno;
 /* Rename the non ANSI C functions. This is required by the standard
   because some ANSI C functions will require linking with this object
   file and the name space must not be polluted. */
+# define strdup __strdup
 # define getcwd __getcwd
 # ifndef stpcpy
 # define stpcpy __stpcpy
@@ -124,18 +124,12 @@ _nl_find_domain (const char *dirname, char *locale,
  alias_value = _nl_expand_alias (locale);
  if (alias_value != NULL)
    {
-#if defined _LIBC || defined HAVE_STRDUP
-Â Â Â Â Â locale = strdup (alias_value);
-Â Â Â Â Â if (locale == NULL)
-Â Â Â Â Â Â return NULL;
-#else
      size_t len = strlen (alias_value) + 1;
      locale = (char *) malloc (len);
      if (locale == NULL)
        return NULL;
Â
      memcpy (locale, alias_value, len);
-#endif
    }
Â
  /* Now we determine the single parts of the locale name. First
@@ -462,7 +462,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
  if (__glibc_unlikely (lia == NULL))
    return NULL;
Â
-Â lia->name = strdup (*namep);
+Â lia->name = __strdup (*namep);
  if (__glibc_unlikely (lia->name == NULL))
    {
      free (lia);
@@ -283,7 +283,7 @@ setlocale (int category, const char *locale)
      if (__glibc_unlikely (strchr (locale, ';') != NULL))
        {
          /* This is a composite name. Make a copy and split it up. */
-Â Â Â Â Â Â Â Â locale_copy = strdup (locale);
+Â Â Â Â Â Â Â Â locale_copy = __strdup (locale);
          if (__glibc_unlikely (locale_copy == NULL))
            {
              __libc_rwlock_unlock (__libc_setlocale_lock);
@@ -34,7 +34,7 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
  if (!__spawn_valid_fd (fd))
    return EBADF;
Â
-Â char *path_copy = strdup (path);
+Â char *path_copy = __strdup (path);
  if (path_copy == NULL)
    return ENOMEM;
Â
@@ -60,7 +60,7 @@ putenv (char *string)
      int use_malloc = !__libc_use_alloca (name_end - string + 1);
      if (__builtin_expect (use_malloc, 0))
        {
-Â Â Â Â Â Â Â Â name = strndup (string, name_end - string);
+Â Â Â Â Â Â Â Â name = __strndup (string, name_end - string);
          if (name == NULL)
            return -1;
        }
@@ -87,7 +87,7 @@ __registerrpc (u_long prognum, u_long versnum, u_long procnum,
      transp = svcudp_create (RPC_ANYSOCK);
      if (transp == NULL)
        {
-Â Â Â Â Â Â Â Â buf = strdup (_("couldn't create an rpc server\n"));
+Â Â Â Â Â Â Â Â buf = __strdup (_("couldn't create an rpc server\n"));
          goto err_out;
        }
    }
@@ -103,7 +103,7 @@ __registerrpc (u_long prognum, u_long versnum, u_long procnum,
  pl = (struct proglst_ *) malloc (sizeof (struct proglst_));
  if (pl == NULL)
    {
-Â Â Â Â Â buf = strdup (_("registerrpc: out of memory\n"));
+Â Â Â Â Â buf = __strdup (_("registerrpc: out of memory\n"));
      goto err_out;
    }
  pl->p_progname = progname;
@@ -536,7 +536,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
                      }
                    else
                      {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â namebuf = strndup (name, scope_delim - name);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â namebuf = __strndup (name, scope_delim - name);
                        if (namebuf == NULL)
                          {
                            assert (!malloc_name);
@@ -1139,7 +1139,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
                  malloc_canonbuf = false;
                else
                  {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â canon = strdup (canon);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â canon = __strdup (canon);
                    if (canon == NULL)
                      {
                        result = -EAI_MEMORY;