* 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>.
This commit is contained in:
Ulrich Drepper 2001-01-28 22:44:38 +00:00
parent 59c8d6e147
commit 3584d5fb31
3 changed files with 14 additions and 7 deletions

View File

@ -1,5 +1,10 @@
2001-01-28 Ulrich Drepper <drepper@redhat.com> 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/netinet/in.h-data: Allow all of <inttypes.h>.
* conform/data/spawn.h-data: Allow all of <sched.h>. * conform/data/spawn.h-data: Allow all of <sched.h>.

View File

@ -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. 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
@ -20,9 +20,14 @@
#define _ARPA_INET_H 1 #define _ARPA_INET_H 1
#include <features.h> #include <features.h>
#include <sys/types.h>
#include <netinet/in.h> /* To define `struct in_addr'. */ #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 __BEGIN_DECLS
/* Convert Internet host address from numbers-and-dots notation in CP /* Convert Internet host address from numbers-and-dots notation in CP

View File

@ -20,11 +20,8 @@
#define _NETINET_IN_H 1 #define _NETINET_IN_H 1
#include <features.h> #include <features.h>
#include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <bits/types.h>
#include <sys/types.h>
#include <bits/socket.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -212,7 +209,7 @@ extern const struct in6_addr in6addr_loopback; /* ::1 */
#define INET6_ADDRSTRLEN 46 #define INET6_ADDRSTRLEN 46
/* Get the definition of the macro to define the common sockaddr members. */ /* 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. */ /* Structure describing an Internet socket address. */