summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2012-06-15 09:45:23 +0200
committerAnand Avati <avati@redhat.com>2012-07-05 11:28:31 -0700
commitd98068a71b63330180281e09347c02d69213c2aa (patch)
treea3b2ad595f409fd520cb03033b83d8faed8c0519
parentd3f1007400735812c88353ed6b0a49d9d4d2c7b2 (diff)
NetBSD build fixes.
This is a backport of Change-Id: Ib8183d4b585465d05a7adf3a4ceae93ae1bded15 BUG: 764655 Change-Id: I552b87b72c234b3a11af6ffd4a03975879602363 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.com/3574 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--cli/src/cli-cmd-volume.c2
-rw-r--r--contrib/fuse-lib/mount.c2
-rw-r--r--rpc/xdr/src/nlm4-xdr.h7
-rw-r--r--xlators/features/marker/utils/src/gsyncd.c2
-rw-r--r--xlators/features/marker/utils/src/procdiggy.c1
5 files changed, 14 insertions, 0 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index d64322188..bad9351fd 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 bbc05f286..759014fe2 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -551,6 +551,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname, char *mnt_param, int fd)
else
mounted = 1;
+#ifndef __NetBSD__
if (geteuid () == 0) {
char *newmnt = fuse_mnt_resolve_path ("fuse", mountpoint);
@@ -569,6 +570,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname, char *mnt_param, int fd)
goto out;
}
}
+#endif /* __NetBSD__ */
out:
if (ret == -1) {
diff --git a/rpc/xdr/src/nlm4-xdr.h b/rpc/xdr/src/nlm4-xdr.h
index f9d6efd4d..e2e1619fc 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 438451a44..9c598ce66 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 6f6e1dd31..0baab966d 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"