--- ./tirpc/rpc/xdr.h 2014-11-21 21:27:55.357928818 +0000 +++ ./tirpc/rpc/xdr.h 2014-11-21 21:27:55.358928818 +0000 @@ -40,7 +40,9 @@ #ifndef _TIRPC_XDR_H #define _TIRPC_XDR_H +#ifdef __GLIBC__ #include +#endif #include #include --- ./tirpc/rpc/pmap_prot.h 2014-11-21 21:27:55.356928818 +0000 +++ ./tirpc/rpc/pmap_prot.h 2014-11-21 21:27:55.357928818 +0000 @@ -71,7 +71,9 @@ #ifndef _RPC_PMAP_PROT_H #define _RPC_PMAP_PROT_H +#ifdef __GLIBC__ #include +#endif #define PMAPPORT ((u_short)111) #define PMAPPROG ((u_long)100000) --- ./tirpc/rpc/auth.h 2014-11-21 21:27:55.350928818 +0000 +++ ./tirpc/rpc/auth.h 2014-11-21 21:27:55.351928818 +0000 @@ -48,7 +48,9 @@ #include #include +#ifdef __GLIBC__ #include +#endif #include #include --- ./tirpc/rpc/svc.h 2014-11-21 21:27:55.359928818 +0000 +++ ./tirpc/rpc/svc.h 2014-11-21 21:27:55.360928818 +0000 @@ -40,7 +40,9 @@ #ifndef _TIRPC_SVC_H #define _TIRPC_SVC_H +#ifdef __GLIBC__ #include +#endif /* * This interface must manage two items concerning remote procedure calling: --- ./tirpc/rpc/svc_soc.h 2014-11-21 21:27:55.362928818 +0000 +++ ./tirpc/rpc/svc_soc.h 2014-11-21 21:27:55.363928818 +0000 @@ -38,7 +38,9 @@ #ifndef _RPC_SVC_SOC_H #define _RPC_SVC_SOC_H +#ifdef __GLIBC__ #include +#endif /* #pragma ident "@(#)svc_soc.h 1.11 94/04/25 SMI" */ /* svc_soc.h 1.8 89/05/01 SMI */ --- ./tirpc/rpc/clnt_soc.h 2014-11-21 21:27:55.347928818 +0000 +++ ./tirpc/rpc/clnt_soc.h 2014-11-21 21:27:55.347928818 +0000 @@ -46,7 +46,9 @@ * with TS-RPC. */ +#ifdef __GLIBC__ #include +#endif #define UDPMSGSIZE 8800 /* rpc imposed limit on udp msg size */ --- ./tirpc/rpc/rpc_com.h 2014-11-21 21:27:55.348928818 +0000 +++ ./tirpc/rpc/rpc_com.h 2014-11-21 21:27:55.348928818 +0000 @@ -41,7 +41,9 @@ #ifndef _RPC_RPCCOM_H #define _RPC_RPCCOM_H +#ifdef __GLIBC__ #include +#endif /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */ --- ./tirpc/rpc/auth_unix.h 2014-11-21 21:27:55.361928818 +0000 +++ ./tirpc/rpc/auth_unix.h 2014-11-21 21:27:55.361928818 +0000 @@ -45,7 +45,9 @@ #ifndef _TIRPC_AUTH_UNIX_H #define _TIRPC_AUTH_UNIX_H +#ifdef __GLIBC__ #include +#endif /* The machine name is part of a credential; it may not exceed 255 bytes */ #define MAX_MACHINE_NAME 255 --- ./tirpc/rpc/pmap_rmt.h 2014-11-21 21:27:55.354928818 +0000 +++ ./tirpc/rpc/pmap_rmt.h 2014-11-21 21:27:55.355928818 +0000 @@ -41,7 +41,9 @@ #ifndef _RPC_PMAP_RMT_H #define _RPC_PMAP_RMT_H +#ifdef __GLIBC__ #include +#endif struct rmtcallargs { u_long prog, vers, proc, arglen; --- ./tirpc/rpc/des_crypt.h 2014-11-21 21:27:55.355928818 +0000 +++ ./tirpc/rpc/des_crypt.h 2014-11-21 21:27:55.356928818 +0000 @@ -43,7 +43,9 @@ #ifndef _DES_DES_CRYPT_H #define _DES_DES_CRYPT_H +#ifdef __GLIBC__ #include +#endif #include #define DES_MAXDATA 8192 /* max bytes encrypted in one call */ --- ./tirpc/rpc/clnt.h 2014-11-21 21:27:55.352928818 +0000 +++ ./tirpc/rpc/clnt.h 2014-11-21 21:27:55.353928818 +0000 @@ -42,7 +42,9 @@ #include #include +#ifdef __GLIBC__ #include +#endif #include #include --- ./tirpc/rpc/pmap_clnt.h 2014-11-21 21:27:55.349928818 +0000 +++ ./tirpc/rpc/pmap_clnt.h 2014-11-21 21:27:55.349928818 +0000 @@ -63,7 +63,9 @@ #ifndef _RPC_PMAP_CLNT_H_ #define _RPC_PMAP_CLNT_H_ +#ifdef __GLIBC__ #include +#endif #ifdef __GLIBC__ __BEGIN_DECLS --- ./tirpc/rpcsvc/crypt.x 2014-11-21 21:27:55.363928818 +0000 +++ ./tirpc/rpcsvc/crypt.x 2014-11-21 21:27:55.364928818 +0000 @@ -31,7 +31,9 @@ */ #ifndef RPC_HDR -%#include +%#ifdef __GLIBC__ +#include +#endif %__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $"); #endif --- ./src/auth_none.c 2014-11-21 21:27:55.327928818 +0000 +++ ./src/auth_none.c 2014-11-21 21:27:55.328928818 +0000 @@ -31,7 +31,9 @@ static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC"; #endif +#ifdef __GLIBC__ #include +#endif __FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obrien Exp $"); */ --- ./src/crypt_client.c 2014-11-21 21:27:55.339928818 +0000 +++ ./src/crypt_client.c 2014-11-21 21:27:55.339928818 +0000 @@ -30,7 +30,9 @@ * SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif #include #include --- ./src/xdr_reference.c 2014-11-21 21:27:55.307928818 +0000 +++ ./src/xdr_reference.c 2014-11-21 21:27:55.308928818 +0000 @@ -26,8 +26,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif +#ifdef __GLIBC__ #include +#endif /* * xdr_reference.c, Generic XDR routines impelmentation. --- ./src/auth_unix.c 2014-11-21 21:27:55.313928818 +0000 +++ ./src/auth_unix.c 2014-11-21 21:27:55.315928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * auth_unix.c, Implements UNIX style authentication parameters. --- ./src/authdes_prot.c 2014-11-21 21:27:55.319928818 +0000 +++ ./src/authdes_prot.c 2014-11-21 21:27:55.319928818 +0000 @@ -1,4 +1,6 @@ +#ifdef __GLIBC__ #include +#endif /* * Copyright (c) 2009, Sun Microsystems, Inc. * All rights reserved. --- ./src/rpcb_st_xdr.c 2014-11-21 21:27:55.294928818 +0000 +++ ./src/rpcb_st_xdr.c 2014-11-21 21:27:55.295928818 +0000 @@ -35,7 +35,9 @@ * routines used with the rpcbind stats facility. */ +#ifdef __GLIBC__ #include +#endif #include --- ./src/auth_time.c 2014-11-21 21:27:55.340928818 +0000 +++ ./src/auth_time.c 2014-11-21 21:27:55.341928818 +0000 @@ -25,7 +25,9 @@ * needed to deal with TCP connections. */ +#ifdef __GLIBC__ #include +#endif #include #include #include --- ./src/des_crypt.c 2014-11-21 21:27:55.322928818 +0000 +++ ./src/des_crypt.c 2014-11-21 21:27:55.323928818 +0000 @@ -39,7 +39,9 @@ static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; #endif #endif +#ifdef __GLIBC__ #include +#endif static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * ); int (*__des_crypt_LOCAL)() = 0; --- ./src/svc_vc.c 2014-11-21 21:27:55.330928818 +0000 +++ ./src/svc_vc.c 2014-11-21 21:27:55.331928818 +0000 @@ -27,7 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * svc_vc.c, Server side for Connection Oriented based RPC. --- ./src/xdr_float.c 2014-11-21 21:27:55.335928818 +0000 +++ ./src/xdr_float.c 2014-11-21 21:27:55.336928818 +0000 @@ -27,7 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * xdr_float.c, Generic XDR routines implementation. --- ./src/xdr_sizeof.c 2014-11-21 21:27:55.315928818 +0000 +++ ./src/xdr_sizeof.c 2014-11-21 21:27:55.316928818 +0000 @@ -34,7 +34,9 @@ * when serialized using XDR. */ +#ifdef __GLIBC__ #include +#endif #include #include --- ./src/xdr_array.c 2014-11-21 21:27:55.345928818 +0000 +++ ./src/xdr_array.c 2014-11-21 21:27:55.346928818 +0000 @@ -27,7 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * xdr_array.c, Generic XDR routines impelmentation. --- ./src/rpc_generic.c 2014-11-21 21:27:55.289928818 +0000 +++ ./src/rpc_generic.c 2014-11-21 21:27:55.291928818 +0000 @@ -29,7 +29,9 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ +#ifdef __GLIBC__ #include +#endif /* * rpc_generic.c, Miscl routines for RPC. --- ./src/getpeereid.c 2014-11-21 21:27:55.304928818 +0000 +++ ./src/getpeereid.c 2014-11-21 21:27:55.304928818 +0000 @@ -24,7 +24,9 @@ * SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif #include #include --- ./src/xdr_stdio.c 2014-11-21 21:27:55.332928818 +0000 +++ ./src/xdr_stdio.c 2014-11-21 21:27:55.333928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * xdr_stdio.c, XDR implementation on standard i/o file. --- ./src/clnt_bcast.c 2014-11-21 21:27:55.308928818 +0000 +++ ./src/clnt_bcast.c 2014-11-21 21:27:55.310928818 +0000 @@ -28,7 +28,9 @@ /* * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ +#ifdef __GLIBC__ #include +#endif /* * clnt_bcast.c --- ./src/xdr_mem.c 2014-11-21 21:27:55.328928818 +0000 +++ ./src/xdr_mem.c 2014-11-21 21:27:55.329928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * xdr_mem.h, XDR implementation using memory buffers. --- ./src/key_call.c 2014-11-21 21:27:55.343928818 +0000 +++ ./src/key_call.c 2014-11-21 21:27:55.344928818 +0000 @@ -30,7 +30,9 @@ */ +#ifdef __GLIBC__ #include +#endif /* * key_call.c, Interface to keyserver --- ./src/svc_simple.c 2014-11-21 21:27:55.325928818 +0000 +++ ./src/svc_simple.c 2014-11-21 21:27:55.326928818 +0000 @@ -29,7 +29,9 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ +#ifdef __GLIBC__ #include +#endif /* * svc_simple.c --- ./src/mt_misc.c 2014-11-21 21:27:55.321928818 +0000 +++ ./src/mt_misc.c 2014-11-21 21:27:55.322928818 +0000 @@ -1,5 +1,7 @@ +#ifdef __GLIBC__ #include +#endif #include #include #include --- ./src/authunix_prot.c 2014-11-21 21:27:55.337928818 +0000 +++ ./src/authunix_prot.c 2014-11-21 21:27:55.338928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * authunix_prot.c --- ./src/des_soft.c 2014-11-21 21:27:55.298928818 +0000 +++ ./src/des_soft.c 2014-11-21 21:27:55.299928818 +0000 @@ -1,4 +1,6 @@ -//#include +//#ifdef __GLIBC__ +#include +#endif /* * Copyright (c) 2009, Sun Microsystems, Inc. --- ./src/rpcdname.c 2014-11-21 21:27:55.297928818 +0000 +++ ./src/rpcdname.c 2014-11-21 21:27:55.298928818 +0000 @@ -25,7 +25,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * rpcdname.c --- ./src/getnetpath.c 2014-11-21 21:27:55.336928818 +0000 +++ ./src/getnetpath.c 2014-11-21 21:27:55.337928818 +0000 @@ -25,13 +25,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * Copyright (c) 1989 by Sun Microsystems, Inc. */ +#ifdef __GLIBC__ #include +#endif #include #include #include --- ./src/svc_dg.c 2014-11-21 21:27:55.300928818 +0000 +++ ./src/svc_dg.c 2014-11-21 21:27:55.301928818 +0000 @@ -31,7 +31,9 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ +#ifdef __GLIBC__ #include +#endif /* * svc_dg.c, Server side for connectionless RPC. --- ./src/rpc_com.h 2014-11-21 21:27:55.293928818 +0000 +++ ./src/rpc_com.h 2014-11-21 21:27:55.293928818 +0000 @@ -40,7 +40,9 @@ #ifndef _TIRPC_RPCCOM_H #define _TIRPC_RPCCOM_H +#ifdef __GLIBC__ #include +#endif /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */ --- ./src/pmap_getmaps.c 2014-11-21 21:27:55.344928818 +0000 +++ ./src/pmap_getmaps.c 2014-11-21 21:27:55.345928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * pmap_getmap.c --- ./src/pmap_clnt.c 2014-11-21 21:27:55.320928818 +0000 +++ ./src/pmap_clnt.c 2014-11-21 21:27:55.320928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * pmap_clnt.c --- ./src/bindresvport.c 2014-11-21 21:27:55.296928818 +0000 +++ ./src/bindresvport.c 2014-11-21 21:27:55.297928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * Copyright (c) 1987 by Sun Microsystems, Inc. --- ./src/xdr_rec.c 2014-11-21 21:27:55.316928818 +0000 +++ ./src/xdr_rec.c 2014-11-21 21:27:55.318928818 +0000 @@ -27,8 +27,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif +#ifdef __GLIBC__ #include +#endif /* * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking" --- ./src/clnt_perror.c 2014-11-21 21:27:55.302928818 +0000 +++ ./src/clnt_perror.c 2014-11-21 21:27:55.303928818 +0000 @@ -27,7 +27,9 @@ */ /* +#ifdef __GLIBC__ #include +#endif */ /* * clnt_perror.c --- ./src/key_prot_xdr.c 2014-11-21 21:27:55.341928818 +0000 +++ ./src/key_prot_xdr.c 2014-11-21 21:27:55.342928818 +0000 @@ -33,7 +33,9 @@ */ /* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ +#ifdef __GLIBC__ #include +#endif /* * Compiled from key_prot.x using rpcgen. --- ./src/getnetconfig.c 2014-11-21 21:27:55.305928818 +0000 +++ ./src/getnetconfig.c 2014-11-21 21:27:55.306928818 +0000 @@ -32,7 +32,9 @@ #include #include +#ifdef __GLIBC__ #include +#endif #include #include #include --- ./src/getpublickey.c 2014-11-21 21:27:55.291928818 +0000 +++ ./src/getpublickey.c 2014-11-21 21:27:55.292928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ /* +#ifdef __GLIBC__ #include +#endif */ /* --- ./src/clnt_simple.c 2014-11-21 21:27:55.333928818 +0000 +++ ./src/clnt_simple.c 2014-11-21 21:27:55.334928818 +0000 @@ -29,7 +29,9 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ +#ifdef __GLIBC__ #include +#endif /* * clnt_simple.c --- ./src/auth_des.c 2014-11-21 21:27:55.323928818 +0000 +++ ./src/auth_des.c 2014-11-21 21:27:55.325928818 +0000 @@ -38,7 +38,9 @@ #include #include #include +#ifdef __GLIBC__ #include +#endif #include #include #include @@ -52,7 +54,9 @@ #if defined(LIBC_SCCS) && !defined(lint) #endif +#ifdef __GLIBC__ #include +#endif #define USEC_PER_SEC 1000000 #define RTIME_TIMEOUT 5 /* seconds to wait for sync */ --- ./src/xdr.c 2014-11-21 21:27:55.310928818 +0000 +++ ./src/xdr.c 2014-11-21 21:27:55.313928818 +0000 @@ -26,7 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __GLIBC__ #include +#endif /* * xdr.c, Generic XDR routines implementation. --- tirpc/rpc/types.h.orig 2014-11-28 07:06:33.011289976 +0000 +++ tirpc/rpc/types.h.orig 2014-11-28 07:07:30.834289976 +0000 @@ -39,7 +39,9 @@ #define _TIRPC_TYPES_H #include +#ifdef __GLIBC__ #include +#endif typedef int32_t bool_t; typedef int32_t enum_t; --- tirpc/netconfig.h.orig 2014-11-28 07:09:35.009289976 +0000 +++ tirpc/netconfig.h.orig 2014-11-28 07:10:07.569289976 +0000 @@ -2,7 +2,9 @@ #define _NETCONFIG_H_ #include +#ifdef __GLIBC__ #include +#endif #define NETCONFIG "/etc/netconfig" #define NETPATH "NETPATH"