MOUNT: Add RPC support for MOUNTv1

[deb_libnfs.git] / include / libnfs-private.h

diff --git a/include/libnfs-private.h b/include/libnfs-private.h
index f153e35d9f063ac974bc2f56001e956880e79144..328d79dc62720d45f2205bb61f9d1c3081fa0b30 100644 (file)
--- a/include/libnfs-private.h
+++ b/include/libnfs-private.h
@@ -18,11 +18,14 @@
 #include "config.h"  /* HAVE_SOCKADDR_STORAGE ? */
 #endif
 
+#ifndef WIN32
 #include <sys/socket.h>  /* struct sockaddr_storage */
+#endif
 
 #include "libnfs-zdr.h"
 
-#ifndef HAVE_SOCKADDR_STORAGE
+
+#if !defined(HAVE_SOCKADDR_STORAGE) && !defined(WIN32)
 /*
  * RFC 2553: protocol-independent placeholder for socket addresses
  */
@@ -33,7 +36,7 @@
                                _SS_PAD1SIZE - _SS_ALIGNSIZE)
 
 struct sockaddr_storage {
-#ifdef HAVE_SA_LEN
+#ifdef HAVE_SOCKADDR_LEN
        unsigned char ss_len;           /* address length */
        unsigned char ss_family;        /* address family */
 #else
@@ -65,7 +68,7 @@ struct rpc_context {
        void *connect_data;
 
        struct AUTH *auth;
-       unsigned long xid;
+       uint32_t xid;
 
        /* buffer used for encoding RPC PDU */
        char *encodebuf;
@@ -95,7 +98,7 @@ struct rpc_context {
 struct rpc_pdu {
        struct rpc_pdu *next;
 
-       unsigned long xid;
+       uint32_t xid;
        ZDR zdr;
 
        uint32_t written;