Get rid of the multiple-include protection in our RPC headers, so we

include them even if we also happen to have included system RPC headers,
as we want *our* versions of the structures (which use types with
explicit sizes for structure members, as we use them for on-the-wire
data).

Change pmap_prot.h to prefix all #defines and structure names with
"SUNRPC_" or "sunrpc_", to avoid collisions with any definitions and
structure names from the system header files.

1 files changed, 1 insertions, 6 deletions

diff --git a/rpc_msg.h b/rpc_msg.h
index fda52fe8..3e79ac71 100644
--- a/rpc_msg.h
+++ b/rpc_msg.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/rpc_msg.h,v 1.1 2004-12-27 00:41:32 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/rpc_msg.h,v 1.2 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -39,9 +39,6 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#ifndef __RPC_MSG_H_
-#define __RPC_MSG_H_
-
 #define SUNRPC_MSG_VERSION	((u_int32_t) 2)
 
 /*
@@ -129,5 +126,3 @@ struct sunrpc_msg {
 };
 #define	acpted_rply	ru.RM_rmb.ru.RP_ar
 #define	rjcted_rply	ru.RM_rmb.ru.RP_dr
-
-#endif /* !__RPC_MSG_H_ */