X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fnfsc%2Flibnfs-zdr.h;h=aa9f1d8d1a8fc6b593bb502e23de84529136b842;hb=bce63d849cdc3870d3e99fe8a968924a836aa63e;hp=44f73786c91d97330884ee67fb01f947183eb1ef;hpb=e803ae576042a8c9d6f61e1e1ec58f26bf56aaa2;p=deb_libnfs.git

diff --git a/include/nfsc/libnfs-zdr.h b/include/nfsc/libnfs-zdr.h
index 44f7378..aa9f1d8 100644
--- a/include/nfsc/libnfs-zdr.h
+++ b/include/nfsc/libnfs-zdr.h
@@ -26,16 +26,25 @@
  * 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>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define _RPC_RPC_H 1
 #define _RPC_ZDR_H 1
 #define _RPC_AUTH_H 1
@@ -43,6 +52,7 @@
 /* we dont need these */
 typedef void CLIENT;
 struct svc_req {
+	int _dummy_;
 };
 typedef void SVCXPRT;
 
@@ -58,8 +68,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 +102,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 +190,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;
@@ -218,11 +230,11 @@ bool_t libnfs_zdr_u_int(ZDR *zdrs, uint32_t *u);
 #define zdr_int libnfs_zdr_int
 bool_t libnfs_zdr_int(ZDR *zdrs, int32_t *i);
 
-#define zdr_u_quad_t libnfs_zdr_u_quad_t
-bool_t libnfs_zdr_u_quad_t(ZDR *zdrs, uint64_t *u);
+#define zdr_uint64_t libnfs_zdr_uint64_t
+bool_t libnfs_zdr_uint64_t(ZDR *zdrs, uint64_t *u);
 
-#define zdr_quad_t libnfs_zdr_quad_t
-bool_t libnfs_zdr_quad_t(ZDR *zdrs, int64_t *i);
+#define zdr_int64_t libnfs_zdr_int64_t
+bool_t libnfs_zdr_int64_t(ZDR *zdrs, int64_t *i);
 
 #define zdr_enum libnfs_zdr_enum
 bool_t libnfs_zdr_enum(ZDR *zdrs, enum_t *e);
@@ -254,11 +266,13 @@ uint32_t libnfs_zdr_getpos(ZDR *zdrs);
 #define zdr_free libnfs_zdr_free
 void libnfs_zdr_free(zdrproc_t proc, char *objp);
 
+struct rpc_context;
+
 #define zdr_callmsg libnfs_zdr_callmsg
-bool_t libnfs_zdr_callmsg(ZDR *zdrs, struct rpc_msg *msg);
+bool_t libnfs_zdr_callmsg(struct rpc_context *rpc, ZDR *zdrs, struct rpc_msg *msg);
 
 #define zdr_replymsg libnfs_zdr_replymsg
-bool_t libnfs_zdr_replymsg(ZDR *zdrs, struct rpc_msg *msg);
+bool_t libnfs_zdr_replymsg(struct rpc_context *rpc, ZDR *zdrs, struct rpc_msg *msg);
 
 #define authnone_create libnfs_authnone_create
 struct AUTH *libnfs_authnone_create(void);
@@ -272,4 +286,8 @@ struct AUTH *libnfs_authunix_create_default(void);
 #define auth_destroy libnfs_auth_destroy
 void libnfs_auth_destroy(struct AUTH *auth);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif