From 3584d5fb31de58aef717b4eb8b71be4093e10430 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 28 Jan 2001 22:44:38 +0000
Subject: [PATCH] Update.

	* 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>.
---
 ChangeLog         | 5 +++++
 inet/arpa/inet.h  | 9 +++++++--
 inet/netinet/in.h | 7 ++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e269bb..3020873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a9381de..9453425 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 3ffa5e2..ececb55 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.  */
-- 
2.7.4