Initial support for NSM

[deb_libnfs.git] / include / nfsc / libnfs-zdr.h

diff --git a/include/nfsc/libnfs-zdr.h b/include/nfsc/libnfs-zdr.h
index 44f73786c91d97330884ee67fb01f947183eb1ef..5d9fe7c2cbdb387cf48e8e61de33d51927cd53cd 100644 (file)
--- a/include/nfsc/libnfs-zdr.h
+++ b/include/nfsc/libnfs-zdr.h
@@ -26,11 +26,16 @@
  * and slightly modified.
  ************************************************************/
 
-#include "config.h"
-
 #ifndef _LIBNFS_ZDR_H_
 #define _LIBNFS_ZDR_H_
 
+#ifdef WIN32
+#ifndef CADDR_T_DEFINED
+#define CADDR_T_DEFINED
+typedef char *caddr_t;
+#endif
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 #include <stdint.h>
@@ -43,6 +48,7 @@
 /* we dont need these */
 typedef void CLIENT;
 struct svc_req {
+       int _dummy_;
 };
 typedef void SVCXPRT;
 
@@ -58,8 +64,12 @@ typedef void SVCXPRT;
 #define IZDR_PUT_BOOL(...)             assert(0)
 #define IZDR_GET_BOOL(...)             (assert(0), 0)
 
+#ifndef TRUE
 #define TRUE           1
+#endif
+#ifndef FALSE
 #define FALSE          0
+#endif
 
 enum zdr_op {
        ZDR_ENCODE = 0,
@@ -88,8 +98,6 @@ typedef uint32_t bool_t;
 
 typedef int (*zdrproc_t) (ZDR *, void *,...);
 
-/* XXX find out what we can get rid of */
-
 #define AUTH_NONE 0
 #define AUTH_NULL 0
 #define AUTH_UNIX 1
@@ -178,8 +186,8 @@ struct rejected_reply {
        enum reject_stat stat;
        union {
                struct {
-                       u_long low;
-                       u_long high;
+                       uint32_t low;
+                       uint32_t high;
                } mismatch_info;
                enum auth_stat stat;
        } reject_data;