diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-10-11 16:38:55 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-10-11 16:38:55 +0000 |
| commit | 4cee966cabbbd52c38260dff95f5ab43772ba5d9 (patch) | |
| tree | 8916b6b47f1f9cd964ee8cf819d67c0acb622969 /sysdeps | |
| parent | fc2a4f5f837f259c239fbd15911f80ca8c6907e3 (diff) | |
Updated to fedora-glibc-20071011T1636cvs/fedora-glibc-2_6_90-19
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/gnu/netinet/tcp.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/bsd4.4/bits/socket.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h index 2ab2909f20..06e8414b58 100644 --- a/sysdeps/gnu/netinet/tcp.h +++ b/sysdeps/gnu/netinet/tcp.h @@ -54,6 +54,7 @@ #ifdef __USE_MISC # include <sys/types.h> +# include <sys/socket.h> # ifdef __FAVOR_BSD typedef u_int32_t tcp_seq; @@ -233,7 +234,7 @@ struct tcp_info struct tcp_md5sig { - struct __kernel_sockaddr_storage tcpm_addr; /* Address associated. */ + struct sockaddr_storage tcpm_addr; /* Address associated. */ u_int16_t __tcpm_pad1; /* Zero. */ u_int16_t tcpm_keylen; /* Key length. */ u_int32_t __tcpm_pad2; /* Zero. */ diff --git a/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/sysdeps/unix/bsd/bsd4.4/bits/socket.h index f74603f948..67db4d8469 100644 --- a/sysdeps/unix/bsd/bsd4.4/bits/socket.h +++ b/sysdeps/unix/bsd/bsd4.4/bits/socket.h @@ -20,7 +20,7 @@ #ifndef __BITS_SOCKET_H #define __BITS_SOCKET_H 1 -#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H +#ifndef _SYS_SOCKET_H # error "Never include <bits/socket.h> directly; use <sys/socket.h> instead." #endif diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 89a9106b2e..11bb607d0d 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -21,7 +21,7 @@ #ifndef __BITS_SOCKET_H #define __BITS_SOCKET_H -#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H +#ifndef _SYS_SOCKET_H # error "Never include <bits/socket.h> directly; use <sys/socket.h> instead." #endif |