* sysdeps/mach/hurd/getpeername.c (__getpeername): Renamed from getpeername. Use...

2000-08-28  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/mach/hurd/getpeername.c (__getpeername): Renamed from
	getpeername.  Use ISO C style function definition.
	(getpeername): Provide weak alias.
	* sysdeps/mach/hurd/setrlimit.c (__setrlimit): Renamed from
	setrlimit.  Use ISO C style function definition.
	(setrlimit): Provide weak alias.

diff --git a/ChangeLog b/ChangeLog
index 0101115..f13cdcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-28  Mark Kettenis  <kettenis@gnu.org>
+
+       * sysdeps/mach/hurd/getpeername.c (__getpeername): Renamed from
+       getpeername.  Use ISO C style function definition.
+       (getpeername): Provide weak alias.
+       * sysdeps/mach/hurd/setrlimit.c (__setrlimit): Renamed from
+       setrlimit.  Use ISO C style function definition.
+       (setrlimit): Provide weak alias.
+
 2000-08-28  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * shlib-versions: Add a rule for S/390 to the libm version list.

diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c
index ffb05d5..7578fb8 100644 (file)
--- a/sysdeps/mach/hurd/getpeername.c
+++ b/sysdeps/mach/hurd/getpeername.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1997, 1999, 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
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
+
 #include <hurd.h>
 #include <hurd/fd.h>
 #include <hurd/socket.h>
@@ -26,10 +27,7 @@
 /* Put the address of the peer connected to socket FD into *ADDR
    (which is *LEN bytes long), and its actual length into *LEN.  */
 int
-getpeername (fd, addrarg, len)
-     int fd;
-     __SOCKADDR_ARG addrarg;
-     socklen_t *len;
+__getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
 {
   error_t err;
   mach_msg_type_number_t buflen = *len;
@@ -60,3 +58,5 @@ getpeername (fd, addrarg, len)
 
   return 0;
 }
+
+weak_alias (__getpeername, getpeername)

diff --git a/sysdeps/mach/hurd/setrlimit.c b/sysdeps/mach/hurd/setrlimit.c
index 1ae2254..28513d9 100644 (file)
--- a/sysdeps/mach/hurd/setrlimit.c
+++ b/sysdeps/mach/hurd/setrlimit.c
@@ -16,20 +16,17 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <hurd.h>
-#include <hurd/resource.h>
 #include <errno.h>
-#include <hurd/fd.h>
 
+#include <hurd.h>
+#include <hurd/fd.h>
+#include <hurd/resource.h>
 
 /* Set the soft and hard limits for RESOURCE to *RLIMITS.
    Only the super-user can increase hard limits.
    Return 0 if successful, -1 if not (and sets errno).  */
-/* XXX should be __setrlimit ? */
 int
-setrlimit (resource, rlimits)
-     enum __rlimit_resource resource;
-     const struct rlimit *rlimits;
+__setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits)
 {
   struct rlimit lim;
 
@@ -59,3 +56,5 @@ setrlimit (resource, rlimits)
 
   return 0;
 }
+
+weak_alias (__setrlimit, setrlimit)