repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libnfs-zdr.h: wrap in extern "C" for C++ compatibility
[deb_libnfs.git]
/
include
/
nfsc
/
libnfs-zdr.h
diff --git
a/include/nfsc/libnfs-zdr.h
b/include/nfsc/libnfs-zdr.h
index 55daa1221a7f4430996526afe464781ba55a6f8f..501875efd66ba2e640a677da053fcfbeec1a4f5e 100644
(file)
--- a/
include/nfsc/libnfs-zdr.h
+++ b/
include/nfsc/libnfs-zdr.h
@@
-26,18
+26,25
@@
* and slightly modified.
************************************************************/
* and slightly modified.
************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#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
@@
-45,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;
@@
-94,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
@@
-278,4
+284,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