8 files changed, 34 insertions, 22 deletions
diff --git a/sysdeps/mach/hurd/bind.c b/sysdeps/mach/hurd/bind.c
index 8b08a6bafa..a42b78ac07 100644
--- a/sysdeps/mach/hurd/bind.c
+++ b/sysdeps/mach/hurd/bind.c
@@ -30,7 +30,7 @@
 
 /* Give the socket FD the local address ADDR (which is LEN bytes long).  */
 int
-bind  (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len)
+__bind  (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len)
 {
   addr_port_t aport;
   error_t err;
@@ -121,3 +121,5 @@ bind  (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len)
 
   return err ? __hurd_dfail (fd, err) : 0;
 }
+
+weak_alias (__bind, bind)
diff --git a/sysdeps/mach/hurd/getsockname.c b/sysdeps/mach/hurd/getsockname.c
index 7c81ed52fd..dd0dddaed9 100644
--- a/sysdeps/mach/hurd/getsockname.c
+++ b/sysdeps/mach/hurd/getsockname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1997, 1999, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 
 /* Put the local address of FD into *ADDR and its length in *LEN.  */
 int
-getsockname (fd, addrarg, len)
+__getsockname (fd, addrarg, len)
      int fd;
      __SOCKADDR_ARG addrarg;
      socklen_t *len;
@@ -59,3 +59,5 @@ getsockname (fd, addrarg, len)
 
   return 0;
 }
+
+weak_alias (__getsockname, getsockname)
diff --git a/sysdeps/mach/hurd/listen.c b/sysdeps/mach/hurd/listen.c
index 46cb68af54..8ee2650bea 100644
--- a/sysdeps/mach/hurd/listen.c
+++ b/sysdeps/mach/hurd/listen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1997, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1997, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,9 +26,8 @@
    N connection requests will be queued before further requests are refused.
    Returns 0 on success, -1 for errors.  */
 
-/* XXX should be __listen ? */
 int
-listen (fd, n)
+__listen (fd, n)
      int fd;
      int n;
 {
@@ -37,3 +36,5 @@ listen (fd, n)
     return __hurd_dfail (fd, err);
   return 0;
 }
+
+weak_alias (__listen, listen)
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index 8816ad44fc..d5c73f4441 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
    the sender, and store the actual size of the address in *ADDR_LEN.
    Returns the number of bytes read or -1 for errors.  */
 ssize_t
-recvfrom (fd, buf, n, flags, addrarg, addr_len)
+__recvfrom (fd, buf, n, flags, addrarg, addr_len)
      int fd;
      void *buf;
      size_t n;
@@ -103,3 +103,5 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len)
 
   return nread;
 }
+
+weak_alias (__recvfrom, recvfrom)
diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
index 73cd03c6d4..2878ef68c7 100644
--- a/sysdeps/mach/hurd/recvmsg.c
+++ b/sysdeps/mach/hurd/recvmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -142,3 +142,4 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
 }
 
 weak_alias (__libc_recvmsg, recvmsg)
+weak_alias (__libc_recvmsg, __recvmsg)
diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c
index c55b559e29..9464d3f6c1 100644
--- a/sysdeps/mach/hurd/sendmsg.c
+++ b/sysdeps/mach/hurd/sendmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -150,3 +150,4 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
 }
 
 weak_alias (__libc_sendmsg, sendmsg)
+weak_alias (__libc_sendmsg, __sendmsg)
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index 50bb77172c..0a6912a3b7 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -27,12 +27,12 @@
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */
 ssize_t
-sendto (int fd,
-	const void *buf,
-	size_t n,
-	int flags,
-	const struct sockaddr_un *addr,
-	socklen_t addr_len)
+__sendto (int fd,
+	  const void *buf,
+	  size_t n,
+	  int flags,
+	  const struct sockaddr_un *addr,
+	  socklen_t addr_len)
 {
   addr_port_t aport;
   error_t err;
@@ -81,3 +81,5 @@ sendto (int fd,
 
   return err ? __hurd_dfail (fd, err) : wrote;
 }
+
+weak_alias (__sendto, sendto)
diff --git a/sysdeps/mach/hurd/setsockopt.c b/sysdeps/mach/hurd/setsockopt.c
index 9875e96311..8ca7f0c724 100644
--- a/sysdeps/mach/hurd/setsockopt.c
+++ b/sysdeps/mach/hurd/setsockopt.c
@@ -25,13 +25,12 @@
 /* Set socket FD's option OPTNAME at protocol level LEVEL
    to *OPTVAL (which is OPTLEN bytes long).
    Returns 0 on success, -1 for errors.  */
-/* XXX __setsockopt ? */
 int
-setsockopt (int fd,
-	    int level,
-	    int optname,
-	    const void *optval,
-	    socklen_t optlen)
+__setsockopt (int fd,
+	      int level,
+	      int optname,
+	      const void *optval,
+	      socklen_t optlen)
 {
   error_t err = HURD_DPORT_USE (fd, __socket_setopt (port,
 						     level, optname,
@@ -40,3 +39,5 @@ setsockopt (int fd,
     return __hurd_dfail (fd, err);
   return 0;
 }
+
+weak_alias (__setsockopt, setsockopt)