repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RPC: include libnfs-zdr.h from all raw libnfs-raw-*.h files
[deb_libnfs.git]
/
include
/
nfsc
/
libnfs-zdr.h
diff --git
a/include/nfsc/libnfs-zdr.h
b/include/nfsc/libnfs-zdr.h
index 44f73786c91d97330884ee67fb01f947183eb1ef..6b2ea9123ce99ab86b17fa3cc839c9e230dc2a13 100644
(file)
--- a/
include/nfsc/libnfs-zdr.h
+++ b/
include/nfsc/libnfs-zdr.h
@@
-26,16
+26,25
@@
* and slightly modified.
************************************************************/
* and slightly modified.
************************************************************/
-#include "config.h"
-
#ifndef _LIBNFS_ZDR_H_
#define _LIBNFS_ZDR_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>
#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
#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 {
/* we dont need these */
typedef void CLIENT;
struct svc_req {
+ int _dummy_;
};
typedef void SVCXPRT;
};
typedef void SVCXPRT;
@@
-58,8
+68,12
@@
typedef void SVCXPRT;
#define IZDR_PUT_BOOL(...) assert(0)
#define IZDR_GET_BOOL(...) (assert(0), 0)
#define IZDR_PUT_BOOL(...) assert(0)
#define IZDR_GET_BOOL(...) (assert(0), 0)
+#ifndef TRUE
#define TRUE 1
#define TRUE 1
+#endif
+#ifndef FALSE
#define FALSE 0
#define FALSE 0
+#endif
enum zdr_op {
ZDR_ENCODE = 0,
enum zdr_op {
ZDR_ENCODE = 0,
@@
-88,8
+102,6
@@
typedef uint32_t bool_t;
typedef int (*zdrproc_t) (ZDR *, void *,...);
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
#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 {
enum reject_stat stat;
union {
struct {
- u
_long
low;
- u
_long
high;
+ u
int32_t
low;
+ u
int32_t
high;
} mismatch_info;
enum auth_stat stat;
} reject_data;
} mismatch_info;
enum auth_stat stat;
} reject_data;
@@
-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);
#define zdr_free libnfs_zdr_free
void libnfs_zdr_free(zdrproc_t proc, char *objp);
+struct rpc_context;
+
#define zdr_callmsg libnfs_zdr_callmsg
#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
#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);
#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);
#define auth_destroy libnfs_auth_destroy
void libnfs_auth_destroy(struct AUTH *auth);
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif