diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/netdb.h | 5 | ||||
| -rw-r--r-- | sunrpc/Makefile | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 43b0b61295..18e5a48d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-05 Andreas Schwab <schwab@redhat.com> + + * sunrpc/Makefile (headers): Add rpc/netdb.h. + (headers-not-in-tirpc): Remove rpc/netdb.h + * resolv/netdb.h: Revert last change. + 2011-05-05 Paul Pluzhnikov <ppluzhnikov@google.com> * Makeconfig (link-libc-static): Use --{start,end}-group to handle diff --git a/resolv/netdb.h b/resolv/netdb.h index b70639b930..6b76a25d3f 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -27,6 +27,11 @@ #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 diff --git a/sunrpc/Makefile b/sunrpc/Makefile index bcaa2152c9..7245debdff 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -47,12 +47,13 @@ subdir := sunrpc rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \ yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ rusers.x spray.x nfs_prot.x rquota.x key_prot.x -headers_in_tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ +headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \ svc.h svc_auth.h types.h xdr.h auth_des.h \ des_crypt.h) -headers_not_in_tirpc = $(addprefix rpc/,netdb.h key_prot.h rpc_des.h) \ +headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +headers = rpc/netdb.h install-others = $(inst_sysconfdir)/rpc generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen @@ -87,7 +88,7 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ rpc_tblout.o rpc_sample.o # These headers are part of rpcgen. distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h \ - $(headers_in_tirpc) $(headers_not_in_tirpc) \ + $(headers-in-tirpc) $(headers-not-in-tirpc) \ $(rpcgen-objs:.o=.c) etc.rpc \ errqueue.h extra-objs = $(rpcgen-objs) |