From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2376 invoked by alias); 5 May 2011 13:29:36 -0000 Received: (qmail 2324 invoked by uid 22791); 5 May 2011 13:29:35 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_PC,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 05 May 2011 13:29:16 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p45DTFsa023278 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 May 2011 09:29:15 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p45DTEK7023153 for ; Thu, 5 May 2011 09:29:15 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Install rpc/netdb.h again X-Yow: ...A housewife is wearing a polypyrene jumpsuit!! Date: Thu, 05 May 2011 13:29:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00005.txt.bz2 2011-05-05 Andreas Schwab * sunrpc/Makefile (headers): Add rpc/netdb.h. (headers-not-in-tirpc): Remove rpc/netdb.h * resolv/netdb.h: Revert last change. --- resolv/netdb.h | 5 +++++ sunrpc/Makefile | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/resolv/netdb.h b/resolv/netdb.h index b70639b..6b76a25 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -27,6 +27,11 @@ #include #include +#ifdef __USE_MISC +/* This is necessary to make this include file properly replace the + Sun version. */ +# include +#endif #ifdef __USE_GNU # define __need_sigevent_t diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 19d2cda..5134ce9 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) -- 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."