about summary refs log tree commit diff
path: root/sysdeps/gnu/netinet/tcp.h
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-10-11 16:32:14 +0000
committerJakub Jelinek <jakub@redhat.com>2007-10-11 16:32:14 +0000
commitd0b5557df8fee6b8c75b9d888af6d46bf824f2fe (patch)
tree6f34729c99940bf297c68d24a96814d20159886f /sysdeps/gnu/netinet/tcp.h
parent3a054d7ab0f7c413d65ec51899d622f8e7008fe9 (diff)
downloadglibc-d0b5557df8fee6b8c75b9d888af6d46bf824f2fe.tar.gz
glibc-d0b5557df8fee6b8c75b9d888af6d46bf824f2fe.tar.xz
glibc-d0b5557df8fee6b8c75b9d888af6d46bf824f2fe.zip
* sysdeps/gnu/netinet/tcp.h: Include sys/socket.h if __USE_MISC. cvs/fedora-glibc-20071011T1636
(struct tcp_md5sig): Change tcpm_addr type to struct sockaddr_storage.
	* inet/netinet/in.h: Don't include bits/socket.h.
	* sysdeps/unix/sysv/linux/bits/socket.h: Only check _SYS_SOCKET_H
	macro.
	* sysdeps/unix/bsd/bsd4.4/bits/socket.h: Likewise.
2007-10-11  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/gnu/netinet/tcp.h: Include sys/socket.h if __USE_MISC.
	(struct tcp_md5sig): Change tcpm_addr type to struct sockaddr_storage.

	* inet/netinet/in.h: Don't include bits/socket.h.
	* sysdeps/unix/sysv/linux/bits/socket.h: Only check _SYS_SOCKET_H
	macro.
	* sysdeps/unix/bsd/bsd4.4/bits/socket.h: Likewise.
Diffstat (limited to 'sysdeps/gnu/netinet/tcp.h')
-rw-r--r--sysdeps/gnu/netinet/tcp.h3
1 files changed, 2 insertions, 1 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.  */