Merge branch 'win32' into win32-3

[deb_libnfs.git] / portmap / portmap.x

diff --git a/portmap/portmap.x b/portmap/portmap.x
index 819951fcee67fbe2b8f0e2169d6f2d95e3fd9500..ef9f08e699b9465f56303039990702ddeedb992c 100644 (file)
--- a/portmap/portmap.x
+++ b/portmap/portmap.x
@@ -4,21 +4,21 @@
 
 const PMAP_PORT = 111;      /* portmapper port number */
 
-struct mapping {
+struct pmap_mapping {
        unsigned int prog;
        unsigned int vers;
        unsigned int prot;
        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<>;
 };
@@ -26,19 +26,19 @@ struct call_result {
 program PMAP_PROGRAM {
        version PMAP_V2 {
                void
-               PMAP_NULL(void)         = 0;
+               PMAP_NULL(void)              = 0;
 
                bool
-               PMAP_SET(mapping)       = 1;
+               PMAP_SET(pmap_mapping)       = 1;
 
                bool
-               PMAP_UNSET(mapping)     = 2;
+               PMAP_UNSET(pmap_mapping)     = 2;
 
                unsigned int
-               PMAP_GETPORT(mapping)   = 3;
+               PMAP_GETPORT(pmap_mapping)   = 3;
 
-               call_result
-               PMAP_CALLIT(call_args)  = 5;
+               pmap_call_result
+               PMAP_CALLIT(pmap_call_args)  = 5;
        } = 2;
 } = 100000;