This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Don't use removed rpc headers


2011-05-05  Andreas Schwab  <schwab@redhat.com>

	* resolv/netdb.h: Don't include <rpc/netdb.h>.
	* nis/Makefile: Don't install rpcsvc/*.
	* inet/protocols/timed.h: Include <sys/types.h> and <sys/time.h>
	instead of <rpc/types.h>.
	(MAXHOSTNAMELEN): Define.
---
 inet/protocols/timed.h |    4 +++-
 nis/Makefile           |    4 ++--
 resolv/netdb.h         |    5 -----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
index 4345bed..b5d4702 100644
--- a/inet/protocols/timed.h
+++ b/inet/protocols/timed.h
@@ -32,7 +32,8 @@
 #ifndef	_PROTOCOLS_TIMED_H
 #define	_PROTOCOLS_TIMED_H 1
 
-#include <rpc/types.h>
+#include <sys/types.h>
+#include <sys/time.h>
 
 /*
  * Time Synchronization Protocol
@@ -40,6 +41,7 @@
 
 #define	TSPVERSION	1
 #define ANYADDR 	NULL
+#define MAXHOSTNAMELEN	64
 
 struct tsp {
 	u_char	tsp_type;
diff --git a/nis/Makefile b/nis/Makefile
index d2934d9..b5c9609 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -23,9 +23,9 @@ subdir	:= nis
 
 aux			:= nis_hash
 
-headers			:= $(wildcard rpcsvc/*.[hx])
 distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
-			   nisplus-parser.h nis_xdr.h nss
+			   nisplus-parser.h nis_xdr.h nss \
+			   $(wildcard rpcsvc/*.[hx])
 
 # These are the databases available for the nis (and perhaps later nisplus)
 # service.  This must be a superset of the services in nss.
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 6b76a25..b70639b 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -27,11 +27,6 @@
 
 #include <netinet/in.h>
 #include <stdint.h>
-#ifdef __USE_MISC
-/* This is necessary to make this include file properly replace the
-   Sun version.  */
-# include <rpc/netdb.h>
-#endif
 
 #ifdef __USE_GNU
 # define __need_sigevent_t
-- 
1.7.4.4


-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]