Fri Jul 26 15:24:25 1996 Ulrich Drepper <drepper@cygnus.com>

	* sunrpc/rpc/auth.h: Add protection against multiple inclusion
	and change K&R prototypes to ANSI prototypes.
	* sunrpc/rpc/auth_unix.h: Ditto.
	* sunrpc/rpc/clnt.h: Ditto.
	* sunrpc/rpc/pmap_clnt.h: Ditto.
	* sunrpc/rpc/pmap_prot.h: Ditto.
	* sunrpc/rpc/pmap_rmt.h: Ditto.
	* sunrpc/rpc/rpc_msg.h: Ditto.
	* sunrpc/rpc/svc.h: Ditto.
	* sunrpc/rpc/svc_auth.h: Ditto.
	* sunrpc/rpc/xdr.h: Ditto.

Fri Jul 26 18:06:58 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sunrpc/rpc/auth.h: Add __BEGIN_DECLS and __END_DECLS.
	* sunrpc/rpc/auth_unix.h: Likewise.
	* sunrpc/rpc/clnt.h: Likewise.
	* sunrpc/rpc/netdb.h: Likewise.
	* sunrpc/rpc/pmap_clnt.h: Likewise.
	* sunrpc/rpc/pmap_prot.h: Likewise.
	* sunrpc/rpc/rpc_msg.h: Likewise.
	* sunrpc/rpc/svc.h: Likewise.
	* sunrpc/rpc/svc_auth.h: Likewise.
	* sunrpc/rpc/xdr.h: Likewise.

	* sunrpc/rpc/pmap_clnt.h: Move definition of type `resultproc_t'
	to here from...
	* sunrpc/pmap_rmt.c: ...here.

1 files changed, 48 insertions, 12 deletions

diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
index d2ea2a88e9..95f0749f87 100644
--- a/sunrpc/rpc/pmap_clnt.h
+++ b/sunrpc/rpc/pmap_clnt.h
@@ -6,28 +6,33 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 
+#ifndef _RPC_PMAP_CLNT_H
+
+#define _RPC_PMAP_CLNT_H	1
+#include <features.h>
+
 /*
  * pmap_clnt.h
  * Supplies C routines to get to portmap services.
@@ -35,6 +40,15 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#ifndef _RPC_PMAP_CLNT_H
+
+#define _RPC_PMAP_CLNT_H	1
+#include <features.h>
+
+__BEGIN_DECLS
+
+typedef bool_t (*resultproc_t)();
+
 /*
  * Usage:
  *	success = pmap_set(program, version, protocol, port);
@@ -43,7 +57,7 @@
  *	head = pmap_getmaps(address);
  *	clnt_stat = pmap_rmtcall(address, program, version, procedure,
  *		xdrargs, argsp, xdrres, resp, tout, port_ptr)
- *		(works for udp only.) 
+ *		(works for udp only.)
  * 	clnt_stat = clnt_broadcast(program, version, procedure,
  *		xdrargs, argsp,	xdrres, resp, eachresult)
  *		(like pmap_rmtcall, except the call is broadcasted to all
@@ -57,9 +71,31 @@
  *		address if the responder to the broadcast.
  */
 
-extern bool_t		pmap_set();
-extern bool_t		pmap_unset();
-extern struct pmaplist	*pmap_getmaps();
-enum clnt_stat		pmap_rmtcall();
-enum clnt_stat		clnt_broadcast();
-extern u_short		pmap_getport();
+extern bool_t pmap_set __P ((u_long __program, u_long __version,
+			     int __protocol, u_short __port));
+
+extern bool_t pmap_unset __P ((u_long __program, u_long __version));
+
+extern struct pmaplist *pmap_getmaps __P ((struct sockaddr_in *__address));
+
+extern enum clnt_stat pmap_rmtcall __P ((struct sockaddr_in *__addr,
+					 u_long __prog, u_long __vers,
+					 u_long __proc, xdrproc_t __xdrargs,
+					 caddr_t __argsp, xdrproc_t __xdrres,
+					 caddr_t __resp, struct timeval __tout,
+					 u_long *__port_ptr));
+
+extern enum clnt_stat clnt_broadcast __P ((u_long __prog, u_long __vers,
+					   u_long __proc, xdrproc_t __xargs,
+					   caddr_t __argsp,
+					   xdrproc_t __xresults,
+					   caddr_t __resultsp,
+					   resultproc_t __eachresult));
+
+extern u_short pmap_getport __P ((struct sockaddr_in *__address,
+				  u_long __program, u_long __version,
+				  u_int __protocol));
+
+__END_DECLS
+
+#endif /* rpc/pmap_clnt.h */