diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | inet/arpa/inet.h | 9 | ||||
| -rw-r--r-- | inet/netinet/in.h | 7 |
3 files changed, 14 insertions, 7 deletions
@@ -1,5 +1,10 @@ 2001-01-28 Ulrich Drepper <drepper@redhat.com> + * inet/arpa/inet.h: Don't include <sys/types.h>. Define socklen_t + if not already happened. + * inet/netinet/in.h: Don't include <sys/types.h>, use <bits/types.h>. + Don't include <limits.h> and <bits/sockaddr.h>. + * conform/data/netinet/in.h-data: Allow all of <inttypes.h>. * conform/data/spawn.h-data: Allow all of <sched.h>. diff --git a/inet/arpa/inet.h b/inet/arpa/inet.h index a9381de6da..945342531e 100644 --- a/inet/arpa/inet.h +++ b/inet/arpa/inet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2001 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 @@ -20,9 +20,14 @@ #define _ARPA_INET_H 1 #include <features.h> -#include <sys/types.h> #include <netinet/in.h> /* To define `struct in_addr'. */ +/* Type for length arguments in socket calls. */ +#ifndef __socklen_t_defined +typedef __socklen_t socklen_t; +# define __socklen_t_defined +#endif + __BEGIN_DECLS /* Convert Internet host address from numbers-and-dots notation in CP diff --git a/inet/netinet/in.h b/inet/netinet/in.h index 3ffa5e2c54..ececb553c3 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -20,11 +20,8 @@ #define _NETINET_IN_H 1 #include <features.h> -#include <limits.h> #include <stdint.h> - -#include <sys/types.h> -#include <bits/socket.h> +#include <bits/types.h> __BEGIN_DECLS @@ -212,7 +209,7 @@ extern const struct in6_addr in6addr_loopback; /* ::1 */ #define INET6_ADDRSTRLEN 46 /* Get the definition of the macro to define the common sockaddr members. */ -#include <bits/sockaddr.h> +#include <bits/socket.h> /* Structure describing an Internet socket address. */ |