From e719518e561033af0ffd07d0c8ad7d777715fe89 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 8 Jun 2011 23:37:22 +0000 Subject: fixing some build issues in Mac OS X Signed-off-by: Amar Tumballi Signed-off-by: Anand Avati BUG: 2966 (MacOSX compile failure: duplicate symbol _k) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2966 --- glusterfsd/src/glusterfsd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'glusterfsd') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 8e1e9ea6d..be8c755d5 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -982,14 +982,14 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx) /* parsing command line arguments */ cmd_args->log_level = DEFAULT_LOG_LEVEL; + + cmd_args->mac_compat = GF_OPTION_DISABLE; #ifdef GF_DARWIN_HOST_OS - cmd_args->mac_compat = GF_OPTION_DEFERRED; /* On Darwin machines, O_APPEND is not handled, * which may corrupt the data */ cmd_args->fuse_direct_io_mode = GF_OPTION_DISABLE; #else - cmd_args->mac_compat = GF_OPTION_DISABLE; cmd_args->fuse_direct_io_mode = GF_OPTION_DEFERRED; #endif cmd_args->fuse_attribute_timeout = -1; @@ -1112,6 +1112,11 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx) } } +#ifdef GF_DARWIN_HOST_OS + if (cmd_args->mount_point) + cmd_args->mac_compat = GF_OPTION_DEFERRED; +#endif + ret = 0; out: return ret; -- cgit