diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-02 08:05:36 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-02 08:05:36 +0000 |
| commit | 750f9af6199e4a76e04c819b25dfcb58cf779b60 (patch) | |
| tree | 7036afda0c826c43c367d3e62e6e1c68e320345c /sysdeps/generic | |
| parent | ad483238a1ef7bce6d8534a84ba548c455d1631e (diff) | |
| download | glibc-750f9af6199e4a76e04c819b25dfcb58cf779b60.tar glibc-750f9af6199e4a76e04c819b25dfcb58cf779b60.tar.gz glibc-750f9af6199e4a76e04c819b25dfcb58cf779b60.tar.bz2 glibc-750f9af6199e4a76e04c819b25dfcb58cf779b60.zip | |
Update.
* posix/unistd.h (socklen_t): Define if it has not yet happened.
(gethostname): Change type of second parameter to socklen_t.
* include/unistd.h (__gethostname): Change type of second
parameter to socklen_t.
* sysdeps/generic/gethostname.c (__gethostname): Likewise.
* sysdeps/mach/hurd/gethostname.c (__gethostname): Likewise.
* sysdeps/unix/sysv/gethostname.c (__gethostname): Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/gethostname.c (__gethostname):
Likewise.
* sysdeps/unix/sysv/linux/gethostname.c: Removed.
* sysdeps/generic/bits/socket.h: Use __socklen_t to define socklen_t.
Allow definition elsewhere.
* sysdeps/unix/sysv/aix/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise.
* sysdeps/generic/bits/types.h: Define __socklen_t.
* sysdeps/unix/sysv/aix/bits/types.h: Likewise.
* sysdeps/unix/sysv/hpux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bits/socket.h | 5 | ||||
| -rw-r--r-- | sysdeps/generic/bits/types.h | 5 | ||||
| -rw-r--r-- | sysdeps/generic/gethostname.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sysdeps/generic/bits/socket.h b/sysdeps/generic/bits/socket.h index 7828d01bb3..4f29d83d78 100644 --- a/sysdeps/generic/bits/socket.h +++ b/sysdeps/generic/bits/socket.h @@ -31,7 +31,10 @@ #include <stddef.h> /* Type for length arguments in socket calls. */ -typedef unsigned int socklen_t; +#ifndef __socklen_t_defined +typedef __socklen_t socklen_t; +# define __socklen_t_defined +#endif /* Types of sockets. */ diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index fd9818e15d..a7b736dffc 100644 --- a/sysdeps/generic/bits/types.h +++ b/sysdeps/generic/bits/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,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 @@ -139,4 +139,7 @@ typedef unsigned int __t_uscalar_t; /* Duplicates info from stdint.h but this is used in unistd.h. */ typedef long int __intptr_t; +/* Duplicate info from sys/socket.h. */ +typedef unsigned int __socklen_t; + #endif /* bits/types.h */ diff --git a/sysdeps/generic/gethostname.c b/sysdeps/generic/gethostname.c index ad09b00827..6c3e1167ab 100644 --- a/sysdeps/generic/gethostname.c +++ b/sysdeps/generic/gethostname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 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 @@ int __gethostname (name, len) char *name; - size_t len; + socklen_t len; { __set_errno (ENOSYS); return -1; |