Make xid be a uint32_t and not either unsigned long or unsigned int

[deb_libnfs.git] / lib / pdu.c

diff --git a/lib/pdu.c b/lib/pdu.c
index 3d8fecaaaefc738467f34253db8fb2dbfb47f5bb..8de51d2fb56025ea7750f84f7126afd5b412eb58 100644 (file)
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -14,17 +14,29 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef AROS
 #include "aros_compat.h"
 #endif
 
 #ifdef WIN32
 #include "win32_compat.h"
-#else
-#include <strings.h>
-#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#endif/*WIN32*/
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -218,7 +230,7 @@ int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size)
        struct rpc_pdu *pdu;
        ZDR zdr;
        int pos, recordmarker = 0;
-       unsigned int xid;
+       uint32_t xid;
        char *reasbuf = NULL;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);