diff options
Diffstat (limited to 'sysdeps/generic/bits')
| -rw-r--r-- | sysdeps/generic/bits/sockaddr.h | 5 | ||||
| -rw-r--r-- | sysdeps/generic/bits/socket.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/bits/sockunion.h | 40 |
3 files changed, 46 insertions, 3 deletions
diff --git a/sysdeps/generic/bits/sockaddr.h b/sysdeps/generic/bits/sockaddr.h index 73a0e26ec4..1c523444ba 100644 --- a/sysdeps/generic/bits/sockaddr.h +++ b/sysdeps/generic/bits/sockaddr.h @@ -1,5 +1,5 @@ /* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -37,5 +37,8 @@ typedef unsigned short int sa_family_t; #define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int)) +/* Return the length of a `sockaddr' structure. */ +#define SA_LEN(_x) __libc_sa_len((_x)->sa_family) +extern int __libc_sa_len __P ((sa_family_t __af)); #endif /* bits/sockaddr.h */ diff --git a/sysdeps/generic/bits/socket.h b/sysdeps/generic/bits/socket.h index a2858b8de8..5dc1e65370 100644 --- a/sysdeps/generic/bits/socket.h +++ b/sysdeps/generic/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Generic/4.3 BSD version. - Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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 @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_SOCKET_H +#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H # error "Never include <bits/socket.h> directly; use <sys/socket.h> instead." #endif diff --git a/sysdeps/generic/bits/sockunion.h b/sysdeps/generic/bits/sockunion.h new file mode 100644 index 0000000000..8f82ce0c20 --- /dev/null +++ b/sysdeps/generic/bits/sockunion.h @@ -0,0 +1,40 @@ +/* Definition of `sockaddr_union'. Generic/4.2 BSD version. + Copyright (C) 1998 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + * Never include this file directly; use <sys/socket.h> instead. + */ + +#ifndef _BITS_SOCKUNION_H +#define _BITS_SOCKUNION_H 1 + +#include <netinet/in.h> +#include <sys/un.h> + +/* Union of all sockaddr types (required by IPv6 Basic API). */ +union sockaddr_union + { + struct sockaddr sa; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr_un sun; + char __maxsize[128]; + }; + +#endif /* bits/sockunion.h */ |