* 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. 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.
This commit is contained in:
parent
3a054d7ab0
commit
d0b5557df8
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
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.
|
||||||
|
|
||||||
2007-10-10 Ulrich Drepper <drepper@redhat.com>
|
2007-10-10 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* locale/programs/locfile-token.h: Remove tok_elif, add tok_elifdef
|
* locale/programs/locfile-token.h: Remove tok_elif, add tok_elifdef
|
||||||
|
|
|
@ -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.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
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 INET_ADDRSTRLEN 16
|
||||||
#define INET6_ADDRSTRLEN 46
|
#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. */
|
/* Structure describing an Internet socket address. */
|
||||||
struct sockaddr_in
|
struct sockaddr_in
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
#ifdef __USE_MISC
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
|
# include <sys/socket.h>
|
||||||
|
|
||||||
# ifdef __FAVOR_BSD
|
# ifdef __FAVOR_BSD
|
||||||
typedef u_int32_t tcp_seq;
|
typedef u_int32_t tcp_seq;
|
||||||
|
@ -233,7 +234,7 @@ struct tcp_info
|
||||||
|
|
||||||
struct tcp_md5sig
|
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_pad1; /* Zero. */
|
||||||
u_int16_t tcpm_keylen; /* Key length. */
|
u_int16_t tcpm_keylen; /* Key length. */
|
||||||
u_int32_t __tcpm_pad2; /* Zero. */
|
u_int32_t __tcpm_pad2; /* Zero. */
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef __BITS_SOCKET_H
|
#ifndef __BITS_SOCKET_H
|
||||||
#define __BITS_SOCKET_H 1
|
#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."
|
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#ifndef __BITS_SOCKET_H
|
#ifndef __BITS_SOCKET_H
|
||||||
#define __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."
|
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue