2000-01-05 Roland McGrath <roland@baalperazim.frob.com>

	* sysdeps/generic/lseek64.c (__libc_lseek64): Renamed from __lseek64.
	(__lseek64, lseek64): Make these weak aliases for __libc_lseek64.
	* sysdeps/mach/hurd/lseek.c (__libc_lseek): Renamed from __lseek.
	(__lseek, lseek): Make these weak aliases for __libc_lseek.
	* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Renamed from __fcntl.
	(__fcntl, fcntl): Make these weak aliases for __libc_fcntl.
	* sysdeps/mach/hurd/open.c (__libc_open): Renamed from __open.
	(__open, open): Make these weak aliases for __libc_open.

diff --git a/sysdeps/generic/lseek64.c b/sysdeps/generic/lseek64.c
index 91ef7f3dcc47d06d8be2b07ecbad4cf9424be9c5..3245bd499ad8c6b5380dbd365eb1f89fdf52071e 100644 (file)
--- a/sysdeps/generic/lseek64.c
+++ b/sysdeps/generic/lseek64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96, 97,98,2000 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
@@ -22,10 +22,7 @@
 
 /* Seek to OFFSET on FD, starting from WHENCE.  */
 off64_t
-__lseek64 (fd, offset, whence)
-     int fd;
-     off64_t offset;
-     int whence;
+__libc_lseek64 (int fd, off64_t offset, int whence)
 {
   if (fd < 0)
     {
@@ -46,6 +43,7 @@ __lseek64 (fd, offset, whence)
   __set_errno (ENOSYS);
   return -1;
 }
-weak_alias (__lseek64, lseek64)
+weak_alias (__libc_lseek64, __lseek64)
+weak_alias (__libc_lseek64, lseek64)
 stub_warning (lseek64)
 #include <stub-tag.h>

diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 21ce766970d103d352993811f3109064302cf926..7cc41e64a23cb02abe1ed4b617f7a0fb915b53ec 100644 (file)
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,93,94,95,96,97,99 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,97,99,2000 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,7 +26,7 @@
 
 /* Perform file control operations on FD.  */
 int
-__fcntl (int fd, int cmd, ...)
+__libc_fcntl (int fd, int cmd, ...)
 {
   va_list ap;
   struct hurd_fd *d;
@@ -198,4 +198,5 @@ __fcntl (int fd, int cmd, ...)
   return result;
 }
 
-weak_alias (__fcntl, fcntl)
+weak_alias (__libc_fcntl, __fcntl)
+weak_alias (__libc_fcntl, fcntl)

diff --git a/sysdeps/mach/hurd/lseek.c b/sysdeps/mach/hurd/lseek.c
index 0f17ce1e0ea6cfa60a4866f57fbe99be8f08c0c3..a9dc4a2f61266b99ad47874c0e5ee7f6d03557be 100644 (file)
--- a/sysdeps/mach/hurd/lseek.c
+++ b/sysdeps/mach/hurd/lseek.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,2000 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
@@ -23,10 +23,7 @@
 
 /* Seek to OFFSET on FD, starting from WHENCE.  */
 off_t
-__lseek (fd, offset, whence)
-     int fd;
-     off_t offset;
-     int whence;
+__libc_lseek (int fd, off_t offset, int whence)
 {
   error_t err;
   if (err = HURD_DPORT_USE (fd, __io_seek (port, offset, whence, &offset)))
@@ -34,4 +31,5 @@ __lseek (fd, offset, whence)
   return offset;
 }
 
-weak_alias (__lseek, lseek)
+weak_alias (__libc_lseek, __lseek)
+weak_alias (__libc_lseek, lseek)

diff --git a/sysdeps/mach/hurd/open.c b/sysdeps/mach/hurd/open.c
index 489e5577b8bf3531346cdc5662e1999abfa03962..617bf7670c2e583fa53b3ab657b1809c92d64385 100644 (file)
--- a/sysdeps/mach/hurd/open.c
+++ b/sysdeps/mach/hurd/open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,97,2000 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 @@
 /* Open FILE with access OFLAG.  If OFLAG includes O_CREAT,
    a third argument is the file protection.  */
 int
-__open (const char *file, int oflag, ...)
+__libc_open (const char *file, int oflag, ...)
 {
   mode_t mode;
   io_t port;
@@ -47,4 +47,5 @@ __open (const char *file, int oflag, ...)
   return _hurd_intern_fd (port, oflag, 1);
 }
 
-weak_alias (__open, open)
+weak_alias (__libc_open, __open)
+weak_alias (__libc_open, open)