Don't use removed rpc headers

diff --git a/ChangeLog b/ChangeLog
index e90eaa95419d5e15d2e2ecc62c022d86cc9bd65a..7f2e75c4f4817f4809c25368ba7913451aba0cf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2011-05-03  Andreas Schwab  <schwab@redhat.com>
 
        * elf/ldconfig.c (add_dir): Don't crash on empty path.

diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
index 4345bed4767109154f0e43f5b00afc8da8a28e00..b5d4702ff32450cdbba798e0f9c431702c2a94a0 100644 (file)
--- 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 f63ada62dbccf59df6628600c5862409c4007292..e7e5f0c78a1d6fa313817fa9eb6bec4dc54d0e73 100644 (file)
--- 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 6b76a25d3f38048612c8f7e8a334c29ce64a31fe..b70639b930c99848b7768dd992ba0e9b207a7a50 100644 (file)
--- 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