diff options
Diffstat (limited to 'contrib/macfuse/mount_darwin.c')
| -rw-r--r-- | contrib/macfuse/mount_darwin.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/macfuse/mount_darwin.c b/contrib/macfuse/mount_darwin.c index 10eff204bc6..d1d1c34e761 100644 --- a/contrib/macfuse/mount_darwin.c +++ b/contrib/macfuse/mount_darwin.c @@ -34,16 +34,15 @@ #include "fuse_param.h" #include "fuse_ioctl.h" -#include "glusterfs.h" -#include "logging.h" -#include "common-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" #define GFFUSE_LOGERR(...) \ gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__) int -gf_fuse_mount (const char *mountpoint, char *fsname, - unsigned long mountflags, char *mnt_param, +gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param, pid_t *mnt_pid, int status_fd) /* Not used on OS X */ { int fd = 0; @@ -95,7 +94,7 @@ gf_fuse_mount (const char *mountpoint, char *fsname, } /* sysctlbyname() includes the trailing '\0' in version_len */ - version_len_desired = strlen("2.x.y") + 1; + version_len_desired = sizeof ("2.x.y"); if (version_len != version_len_desired) { gf_log ("glusterfs-fuse", GF_LOG_ERROR, |