about summary refs log tree commit diff
path: root/inet/netinet
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 /inet/netinet
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 'inet/netinet')
-rw-r--r--inet/netinet/in.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 4fdc0fadf1..136619831a 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2001, 2003, 2004, 2006, 2007
+   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
@@ -211,9 +212,6 @@ extern const struct in6_addr in6addr_loopback;   /* ::1 */
 #define INET_ADDRSTRLEN 16
 #define INET6_ADDRSTRLEN 46
 
-/* Get the definition of the macro to define the common sockaddr members.  */
-#include <bits/socket.h>
-
 
 /* Structure describing an Internet socket address.  */
 struct sockaddr_in