diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2012-04-27 11:41:14 +0200 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-11 00:41:24 -0700 |
| commit | 8c4bf91025e2bf510a56f5789594beceb3c3827c (patch) | |
| tree | 153dc2c2dcf15d80401c8193b3fda919512cb06a | |
| parent | 511f99b88d0e1b2962b3b5bbddf722ad07d15575 (diff) | |
NetBSD build fixes
Change-Id: Ib8183d4b585465d05a7adf3a4ceae93ae1bded15
BUG: 764655
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.com/3238
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | contrib/fuse-lib/mount.c | 2 | ||||
| -rw-r--r-- | rpc/xdr/src/nlm4-xdr.h | 7 | ||||
| -rw-r--r-- | xlators/features/marker/utils/src/gsyncd.c | 2 | ||||
| -rw-r--r-- | xlators/features/marker/utils/src/procdiggy.c | 1 |
5 files changed, 14 insertions, 0 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index d6432218804..bad9351fd52 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1477,6 +1477,7 @@ cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status) status->block_size = 0; } +#ifdef GF_LINUX_HOST_OS memset (key, 0, sizeof (key)); snprintf (key, sizeof (key), "brick%d.mnt_options", i); ret = dict_get_str (dict, key, &(status->mount_options)); @@ -1496,6 +1497,7 @@ cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status) ret = dict_get_str (dict, key, &(status->inode_size)); if (ret) status->inode_size = NULL; +#endif /* GF_LINUX_HOST_OS */ memset (key, 0, sizeof (key)); snprintf (key, sizeof (key), "brick%d.total_inodes", i); diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c index 8c5da3d619f..fde9f316a4d 100644 --- a/contrib/fuse-lib/mount.c +++ b/contrib/fuse-lib/mount.c @@ -600,6 +600,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname, char *mnt_param, pid_t *mt else mounted = 1; +#ifndef __NetBSD__ if (geteuid () == 0) { char *newmnt = fuse_mnt_resolve_path ("fuse", mountpoint); @@ -618,6 +619,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname, char *mnt_param, pid_t *mt goto out; } } +#endif /* __NetBSD__ */ ret = 0; out: diff --git a/rpc/xdr/src/nlm4-xdr.h b/rpc/xdr/src/nlm4-xdr.h index fcc0e51b3c8..683d54ef57a 100644 --- a/rpc/xdr/src/nlm4-xdr.h +++ b/rpc/xdr/src/nlm4-xdr.h @@ -36,6 +36,13 @@ extern "C" { #define LM_MAXSTRLEN 1024 #define MAXNAMELEN 1025 +#if defined(__NetBSD__) +#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 +#endif + /* * The following enums are actually bit encoded for efficient * boolean algebra.... DON'T change them..... diff --git a/xlators/features/marker/utils/src/gsyncd.c b/xlators/features/marker/utils/src/gsyncd.c index 24de4096f8b..b5263c7287c 100644 --- a/xlators/features/marker/utils/src/gsyncd.c +++ b/xlators/features/marker/utils/src/gsyncd.c @@ -27,6 +27,8 @@ #include <stdio.h> #include <unistd.h> #include <string.h> +#include <sys/param.h> /* for PATH_MAX */ + #include "common-utils.h" #include "run.h" diff --git a/xlators/features/marker/utils/src/procdiggy.c b/xlators/features/marker/utils/src/procdiggy.c index e5f9af7b614..18296a47945 100644 --- a/xlators/features/marker/utils/src/procdiggy.c +++ b/xlators/features/marker/utils/src/procdiggy.c @@ -28,6 +28,7 @@ #include <unistd.h> #include <string.h> #include <ctype.h> +#include <sys/param.h> /* for PATH_MAX */ #include "common-utils.h" #include "procdiggy.h" |