diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
| commit | e139b4d0ba2286c0d4d44ba81260c2b287016019 (patch) | |
| tree | 0a21f0761528e0f79da0a9f67106eb128ace0cf7 /rpc/rpc-lib/src/xdr-common.h | |
| parent | 73b60c87ca7f62517a8466431f5a8cf167589c8c (diff) | |
| parent | f2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff) | |
Conflicts:
rpc/xdr/src/glusterfs3-xdr.c
rpc/xdr/src/glusterfs3-xdr.h
xlators/features/changelog/src/Makefile.am
xlators/features/changelog/src/changelog-helpers.h
xlators/features/changelog/src/changelog.c
xlators/mgmt/glusterd/src/glusterd-sm.c
Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2
Diffstat (limited to 'rpc/rpc-lib/src/xdr-common.h')
| -rw-r--r-- | rpc/rpc-lib/src/xdr-common.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h index f221192ad..631f4b284 100644 --- a/rpc/rpc-lib/src/xdr-common.h +++ b/rpc/rpc-lib/src/xdr-common.h @@ -18,8 +18,8 @@ #include <rpc/types.h> #include <sys/types.h> -#include <rpc/auth.h> #include <rpc/xdr.h> +#include <rpc/auth.h> #include <sys/uio.h> #ifdef __NetBSD__ @@ -64,11 +64,18 @@ enum gf_dump_procnum { #define GF_AUTH_GLUSTERFS_MAX_LKOWNER(groups_len) \ (95 - groups_len) -#if GF_DARWIN_HOST_OS +#ifdef GF_LINUX_HOST_OS +#define xdr_u_int32_t xdr_uint32_t +#define xdr_u_int64_t xdr_uint64_t +#endif + +#ifdef GF_DARWIN_HOST_OS #define xdr_u_quad_t xdr_u_int64_t #define xdr_quad_t xdr_int64_t #define xdr_uint32_t xdr_u_int32_t +#define xdr_uint64_t xdr_u_int64_t #define uint64_t u_int64_t +unsigned long xdr_sizeof (xdrproc_t func, void *data); #endif #if defined(__NetBSD__) @@ -78,13 +85,11 @@ enum gf_dump_procnum { #define xdr_uint64_t xdr_u_int64_t #endif - -#if GF_SOLARIS_HOST_OS +#ifdef GF_SOLARIS_HOST_OS #define u_quad_t uint64_t #define quad_t int64_t #define xdr_u_quad_t xdr_uint64_t #define xdr_quad_t xdr_int64_t -#define xdr_uint32_t xdr_uint32_t #endif /* Returns the address of the byte that follows the |