Index: sysdeps/generic/socket.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sysdeps/generic/socket.c,v
retrieving revision 1.1
diff -u -r1.1 socket.c
--- socket.c	1997/10/13 03:52:38	1.1
+++ socket.c	1998/06/02 01:24:03
@@ -23,7 +23,7 @@
    protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
    Returns a file descriptor for the new socket, or -1 for errors.  */
 int
-socket (domain, type, protocol)
+__socket (domain, type, protocol)
      int domain;
      int type;
      int protocol;
@@ -33,5 +33,6 @@
 }
 
 
+weak_alias (__socket, socket);
 stub_warning (socket)
 #include <stub-tag.h>
Index: sysdeps/mach/hurd/ftruncate.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sysdeps/mach/hurd/ftruncate.c,v
retrieving revision 1.7
diff -u -r1.7 ftruncate.c
--- ftruncate.c	1997/05/26 22:22:45	1.7
+++ ftruncate.c	1998/06/02 01:24:27
@@ -18,17 +18,19 @@
 
 #include <sys/types.h>
 #include <errno.h>
+#include <unistd.h>
 #include <hurd.h>
 #include <hurd/fd.h>
 
 /* Truncate the file FD refers to to LENGTH bytes.  */
 int
-ftruncate (fd, length)
+__ftruncate (fd, length)
      int fd;
-     off_t length;
+     __off_t length;
 {
   error_t err;
   if (err = HURD_DPORT_USE (fd, __file_set_size (port, length)))
     return __hurd_dfail (fd, err);
   return 0;
 }
+weak_alias (__ftruncate, ftruncate)
Index: sysdeps/mach/hurd/read.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sysdeps/mach/hurd/read.c,v
retrieving revision 1.13
diff -u -r1.13 read.c
--- read.c	1997/05/26 22:23:38	1.13
+++ read.c	1998/06/02 01:24:27
@@ -23,7 +23,7 @@
 
 /* Read NBYTES into BUF from FD.  Return the number read or -1.  */
 ssize_t
-__read (fd, buf, nbytes)
+__libc_read (fd, buf, nbytes)
      int fd;
      void *buf;
      size_t nbytes;
@@ -32,4 +32,5 @@
   return err ? __hurd_dfail (fd, err) : nbytes;
 }
 
-weak_alias (__read, read)
+weak_alias (__libc_read, __read)
+weak_alias (__libc_read, read)
Index: sysdeps/mach/hurd/socket.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sysdeps/mach/hurd/socket.c,v
retrieving revision 1.11
diff -u -r1.11 socket.c
--- socket.c	1997/05/26 22:24:49	1.11
+++ socket.c	1998/06/02 01:24:29
@@ -26,9 +26,8 @@
 /* Create a new socket of type TYPE in domain DOMAIN, using
    protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
    Returns a file descriptor for the new socket, or -1 for errors.  */
-/* XXX should be __socket ? */
 int
-socket (domain, type, protocol)
+__socket (domain, type, protocol)
      int domain;
      int type;
      int protocol;
@@ -65,3 +64,6 @@
 
   return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1);
 }
+
+
+weak_alias (__socket, socket);
Index: sysdeps/mach/hurd/write.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sysdeps/mach/hurd/write.c,v
retrieving revision 1.12
diff -u -r1.12 write.c
--- write.c	1997/05/26 22:25:20	1.12
+++ write.c	1998/06/02 01:24:29
@@ -22,7 +22,7 @@
 #include <hurd/fd.h>
 
 ssize_t
-__write (fd, buf, nbytes)
+__libc_write (fd, buf, nbytes)
      int fd;
      const void *buf;
      size_t nbytes;
@@ -32,5 +32,5 @@
 }
 
 
-
-weak_alias (__write, write)
+weak_alias (__libc_write, __write);
+weak_alias (__libc_write, write)