diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-06-08 23:37:22 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-16 09:15:28 -0700 |
| commit | e719518e561033af0ffd07d0c8ad7d777715fe89 (patch) | |
| tree | 8ede0ce4fbe1985dcbc749fd786c75de8cae00d5 /glusterfsd | |
| parent | dad63fa8ac00397e337f328b0bb7b641e2680932 (diff) | |
fixing some build issues in Mac OS X
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2966 (MacOSX compile failure: duplicate symbol _k)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2966
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 9 |
1 files changed, 7 insertions, 2 deletions
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; |