Update.

2001-03-17  Ulrich Drepper  <drepper@redhat.com>

	* inet/Makefile (tests): Remove left-over comment.

	* posix/unistd.h: Change type of second parameter back to size_t
	as per upcoming XPG6.
	* sysdeps/unix/sysv/aix/gethostname.c: Change type of second
	parameter back to size_t as per upcoming XPG6.
	* sysdeps/unix/sysv/sysv4/gethostname.c: Likewise.
	* sysdeps/unix/sysv/gethostname.c: Likewise.
	* sysdeps/mach/hurd/gethostname.c: Likewise.
	* sysdeps/generic/gethostname.c: Likewise.

8 files changed, 26 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index c1d9c3ee87..04b9340950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* inet/Makefile (tests): Remove left-over comment.
+
+	* posix/unistd.h: Change type of second parameter back to size_t
+	as per upcoming XPG6.
+	* sysdeps/unix/sysv/aix/gethostname.c: Change type of second
+	parameter back to size_t as per upcoming XPG6.
+	* sysdeps/unix/sysv/sysv4/gethostname.c: Likewise.
+	* sysdeps/unix/sysv/gethostname.c: Likewise.
+	* sysdeps/mach/hurd/gethostname.c: Likewise.
+	* sysdeps/generic/gethostname.c: Likewise.
+
 2001-03-16  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
diff --git a/inet/Makefile b/inet/Makefile
index 19009efc20..240004ac83 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000, 2001 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
@@ -48,7 +48,7 @@ routines := htonl htons		\
 	    in6_addr getnameinfo if_index
 
 tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
-	 tst-gethnm # tst-ipnode
+	 tst-gethnm
 
 include ../Rules
 
diff --git a/posix/unistd.h b/posix/unistd.h
index 809e87a540..1148cb74fc 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -732,7 +732,7 @@ extern int setlogin (__const char *__name) __THROW;
 /* Put the name of the current host in no more than LEN bytes of NAME.
    The result is null-terminated if LEN is large enough for the full
    name and the terminator.  */
-extern int gethostname (char *__name, socklen_t __len) __THROW;
+extern int gethostname (char *__name, size_t __len) __THROW;
 
 /* Set the name of the current host to NAME, which is LEN bytes long.
    This call is restricted to the super-user.  */
diff --git a/sysdeps/generic/gethostname.c b/sysdeps/generic/gethostname.c
index 6c3e1167ab..7004673fe2 100644
--- a/sysdeps/generic/gethostname.c
+++ b/sysdeps/generic/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,2000,2001 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 @@
 int
 __gethostname (name, len)
      char *name;
-     socklen_t len;
+     size_t len;
 {
   __set_errno (ENOSYS);
   return -1;
diff --git a/sysdeps/mach/hurd/gethostname.c b/sysdeps/mach/hurd/gethostname.c
index b74945ba79..4b7a61c95f 100644
--- a/sysdeps/mach/hurd/gethostname.c
+++ b/sysdeps/mach/hurd/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1997, 2000, 2001 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 @@
 int
 __gethostname (name, len)
      char *name;
-     socklen_t len;
+     size_t len;
 {
   /* The host name is just the contents of the file /etc/hostname.  */
   ssize_t n = _hurd_get_host_config ("/etc/hostname", name, len);
diff --git a/sysdeps/unix/sysv/aix/gethostname.c b/sysdeps/unix/sysv/aix/gethostname.c
index 76c8c72d87..9482058854 100644
--- a/sysdeps/unix/sysv/aix/gethostname.c
+++ b/sysdeps/unix/sysv/aix/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 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
@@ -21,7 +21,7 @@
 int
 __gethostname (name, len)
      char *name;
-     socklen_t len;
+     size_t len;
 {
   return gethostname (name, len);
 }
diff --git a/sysdeps/unix/sysv/gethostname.c b/sysdeps/unix/sysv/gethostname.c
index 706564957d..2eb8dcfe9c 100644
--- a/sysdeps/unix/sysv/gethostname.c
+++ b/sysdeps/unix/sysv/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1997, 2000, 2001 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
@@ -27,7 +27,7 @@
 int
 __gethostname (name, len)
      char *name;
-     socklen_t len;
+     size_t len;
 {
   struct utsname buf;
   size_t node_len;
diff --git a/sysdeps/unix/sysv/sysv4/gethostname.c b/sysdeps/unix/sysv/sysv4/gethostname.c
index 3f967e15d4..1a1440f079 100644
--- a/sysdeps/unix/sysv/sysv4/gethostname.c
+++ b/sysdeps/unix/sysv/sysv4/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
@@ -27,7 +27,7 @@ extern int __sysinfo (int command, char *buf, long int count);
 int
 __gethostname (name, namelen)
      char *name;
-     socklen_t namelen;
+     size_t namelen;
 {
   return __sysinfo (SI_HOSTNAME, name, namelen);
 }