diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2005-11-17 17:11:48 +0000 |
---|---|---|
committer | Miklos Szeredi <miklos@szeredi.hu> | 2005-11-17 17:11:48 +0000 |
commit | 9c2ccb43c3cc960334e2ab0069501dc583c7dbf7 (patch) | |
tree | 65cd4225c7c7dea85ea0c143f93a2ba4d4652cdd /lib/helper.c | |
parent | b3f9972a859e95cf836c0044c82fcf312afc566e (diff) | |
download | libfuse-9c2ccb43c3cc960334e2ab0069501dc583c7dbf7.tar.gz |
fix
Diffstat (limited to 'lib/helper.c')
-rw-r--r-- | lib/helper.c | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/lib/helper.c b/lib/helper.c index 79616dc..bb8243c 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -7,7 +7,6 @@ */ #include "fuse_i.h" -#include "fuse_compat.h" #include <stdio.h> #include <stdlib.h> @@ -353,25 +352,6 @@ struct fuse *fuse_setup(int argc, char *argv[], multithreaded, fd, 0); } -struct fuse *fuse_setup_compat22(int argc, char *argv[], - const struct fuse_operations_compat22 *op, - size_t op_size, char **mountpoint, - int *multithreaded, int *fd) -{ - return fuse_setup_common(argc, argv, (struct fuse_operations *) op, - op_size, mountpoint, multithreaded, fd, 22); -} - -struct fuse *fuse_setup_compat2(int argc, char *argv[], - const struct fuse_operations_compat2 *op, - char **mountpoint, int *multithreaded, - int *fd) -{ - return fuse_setup_common(argc, argv, (struct fuse_operations *) op, - sizeof(struct fuse_operations_compat2), - mountpoint, multithreaded, fd, 21); -} - void fuse_teardown(struct fuse *fuse, int fd, char *mountpoint) { (void) fd; @@ -419,6 +399,36 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op, return fuse_main_common(argc, argv, op, op_size, 0); } +#undef fuse_main +int fuse_main(void) +{ + fprintf(stderr, "fuse_main(): This function does not exist\n"); + return -1; +} + +#ifndef __FreeBSD__ + +#include "fuse_compat.h" + +struct fuse *fuse_setup_compat22(int argc, char *argv[], + const struct fuse_operations_compat22 *op, + size_t op_size, char **mountpoint, + int *multithreaded, int *fd) +{ + return fuse_setup_common(argc, argv, (struct fuse_operations *) op, + op_size, mountpoint, multithreaded, fd, 22); +} + +struct fuse *fuse_setup_compat2(int argc, char *argv[], + const struct fuse_operations_compat2 *op, + char **mountpoint, int *multithreaded, + int *fd) +{ + return fuse_setup_common(argc, argv, (struct fuse_operations *) op, + sizeof(struct fuse_operations_compat2), + mountpoint, multithreaded, fd, 21); +} + int fuse_main_real_compat22(int argc, char *argv[], const struct fuse_operations_compat22 *op, size_t op_size) @@ -427,13 +437,6 @@ int fuse_main_real_compat22(int argc, char *argv[], op_size, 22); } -#undef fuse_main -int fuse_main(void) -{ - fprintf(stderr, "fuse_main(): This function does not exist\n"); - return -1; -} - void fuse_main_compat1(int argc, char *argv[], const struct fuse_operations_compat1 *op) { @@ -453,3 +456,5 @@ __asm__(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); __asm__(".symver fuse_teardown,__fuse_teardown@"); __asm__(".symver fuse_main_compat2,fuse_main@"); __asm__(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); + +#endif /* __FreeBSD__ */ |