Update networking includes.

libc/inet/addr.c

@@ -12,6 +12,8 @@
  * inet_ntoa in half (from 190 bytes down to 94).
  */
 
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <string.h>
 #include <ctype.h>
 #include <netinet/in.h>

libc/inet/getproto.c

@@ -51,6 +51,8 @@
 ** SUCH DAMAGE.
 */
 
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>

libc/inet/getservice.c

@@ -52,6 +52,8 @@
 */
 
 
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>

libc/inet/hostid.c

@@ -1,3 +1,5 @@
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

libc/inet/resolv.c

@@ -34,6 +34,8 @@
  *
  */
 
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -46,6 +48,7 @@
 #include <unistd.h>
 #include <cfgfile.h>
 #include <resolv.h>
+#include <netdb.h>
 #include <arpa/nameser.h>
 
 #define MAX_RECURSE 5

libc/inet/rpc/auth_none.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * auth_none.c

libc/inet/rpc/auth_unix.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * auth_unix.c, Implements UNIX style authentication parameters. 

libc/inet/rpc/authunix_prot.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * authunix_prot.c

libc/inet/rpc/bindresvport.c

@@ -31,6 +31,8 @@
  * Copyright (c) 1987 by Sun Microsystems, Inc.
  */
 
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>

libc/inet/rpc/clnt_generic.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 /*
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */

libc/inet/rpc/clnt_perror.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * clnt_perror.c

libc/inet/rpc/clnt_raw.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * clnt_raw.c

libc/inet/rpc/clnt_simple.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /* 
  * clnt_simple.c

libc/inet/rpc/clnt_tcp.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.

libc/inet/rpc/clnt_udp.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * clnt_udp.c, Implements a UDP/IP based, client side RPC.

libc/inet/rpc/get_myaddress.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * get_myaddress.c

libc/inet/rpc/getrpcent.c

@@ -1,9 +1,6 @@
 /* @(#)getrpcent.c	2.2 88/07/29 4.0 RPCSRC */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)getrpcent.c 1.9 87/08/11  Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for

libc/inet/rpc/getrpcport.c

@@ -1,7 +1,6 @@
 /* @(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape

libc/inet/rpc/pmap_clnt.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * pmap_clnt.c

libc/inet/rpc/pmap_getmaps.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * pmap_getmap.c

libc/inet/rpc/pmap_getport.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * pmap_getport.c

libc/inet/rpc/pmap_prot.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * pmap_prot.c

libc/inet/rpc/pmap_prot2.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * pmap_prot2.c

libc/inet/rpc/pmap_rmt.c

@@ -27,9 +27,6 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
-#endif
 
 /*
  * pmap_rmt.c
@@ -39,6 +36,12 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#define __FORCE_GLIBC__
+#include <features.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
@@ -105,7 +108,7 @@ u_long *port_ptr;
  * XDR remote call arguments
  * written for XDR_ENCODE direction only
  */
-bool_t xdr_rmtcall_args(xdrs, args)
+bool_t xdr_rmtcall_args(xdrs, arg2)
 register XDR *xdrs;
 void * arg2;
 {
@@ -150,6 +153,7 @@ register struct rmtcallres *crp;
 	return (FALSE);
 }
 
+void get_myaddress( struct sockaddr_in *addr);
 
 /*
  * The following is kludged-up support for simple rpc broadcasts.
@@ -223,6 +227,8 @@ char *buf;						/* why allocxate more when we can use existing... */
 }
 
 typedef bool_t(*resultproc_t) ();
+void _rpc_dtablesize(void );
+
 
 enum clnt_stat
 clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp,

libc/inet/rpc/rpc_callmsg.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * rpc_callmsg.c

libc/inet/rpc/rpc_dtablesize.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an

libc/inet/rpc/rpc_prot.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * rpc_prot.c

libc/inet/rpc/svc.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc.c 1.41 87/10/13 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * svc.c, Server-side remote procedure call interface.

libc/inet/rpc/svc_auth.c

@@ -1,8 +1,5 @@
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)svc_auth.c	2.1 88/08/07 4.0 RPCSRC; from 1.19 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape

libc/inet/rpc/svc_auth_unix.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * svc_auth_unix.c

libc/inet/rpc/svc_raw.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * svc_raw.c,   This a toy for simple testing and timing.

libc/inet/rpc/svc_run.c

@@ -1,7 +1,6 @@
 /* @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for

libc/inet/rpc/svc_simple.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /* 
  * svc_simple.c

libc/inet/rpc/svc_tcp.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * svc_tcp.c, Server side for TCP/IP based RPC. 

libc/inet/rpc/svc_udp.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * svc_udp.c,

libc/inet/rpc/xdr.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr.c, Generic XDR routines implementation.

libc/inet/rpc/xdr_array.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_array.c, Generic XDR routines impelmentation.

libc/inet/rpc/xdr_float.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_float.c, Generic XDR routines impelmentation.

libc/inet/rpc/xdr_mem.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_mem.h, XDR implementation using memory buffers.

libc/inet/rpc/xdr_rec.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"

libc/inet/rpc/xdr_reference.c

@@ -27,9 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_reference.c, Generic XDR routines impelmentation.

libc/inet/rpc/xdr_stdio.c

@@ -27,11 +27,8 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] =
-
-	"@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
-#endif
+#define __FORCE_GLIBC__
+#include <features.h>
 
 /*
  * xdr_stdio.c, XDR implementation on standard i/o file.

libc/inet/socketcalls.c

@@ -1,3 +1,5 @@
+#define __FORCE_GLIBC__
+#include <features.h>
 #include <errno.h>
 #include <syscall.h>
 #include <sys/socket.h>