From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sun, 26 Jun 2011 08:47:33 +0000 (+1000)
Subject: for portmap callit, change call_args and rell_result to prefix them with pmap_
X-Git-Tag: upstream/1.9.6^2~370
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=5cb18618bc9de4cc75be8199d20ebdf35cc0ccc2

for portmap callit, change call_args and rell_result to prefix them with pmap_
to avoid polluting the namespace too bad
---

diff --git a/portmap/portmap.x b/portmap/portmap.x
index d28edca..6065831 100644
--- a/portmap/portmap.x
+++ b/portmap/portmap.x
@@ -11,14 +11,14 @@ struct pmap_mapping {
        unsigned int port;
 };
 
-struct call_args {
+struct pmap_call_args {
        unsigned int prog;
        unsigned int vers;
        unsigned int proc;
        opaque args<>;
 };
 
-struct call_result {
+struct pmap_call_result {
 	unsigned int port;
 	opaque res<>;
 };
@@ -37,8 +37,8 @@ program PMAP_PROGRAM {
             	unsigned int
             	PMAP_GETPORT(pmap_mapping)   = 3;
 
-		call_result
-		PMAP_CALLIT(call_args)  = 5;
+		pmap_call_result
+		PMAP_CALLIT(pmap_call_args)  = 5;
 	} = 2;
 } = 100000;