From 270ef7be8cae85356e86d5d65ba00e586439c1e8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 18 Mar 2009 16:39:46 +0000 Subject: [PATCH] Don't go for pre 2.5 compatibility. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29594 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/userlandfs/fuse/fuse_common.h | 4 ++-- headers/private/userlandfs/fuse/fuse_compat.h | 4 ++-- headers/private/userlandfs/fuse/fuse_lowlevel_compat.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headers/private/userlandfs/fuse/fuse_common.h b/headers/private/userlandfs/fuse/fuse_common.h index 8d4ba2b211..e43b22d0f2 100644 --- a/headers/private/userlandfs/fuse/fuse_common.h +++ b/headers/private/userlandfs/fuse/fuse_common.h @@ -207,9 +207,9 @@ void fuse_remove_signal_handlers(struct fuse_session *se); * ----------------------------------------------------------- */ #if FUSE_USE_VERSION < 26 -# ifdef __FreeBSD__ +# if defined(__FreeBSD__) || defined(__HAIKU__) # if FUSE_USE_VERSION < 25 -# error On FreeBSD API version 25 or greater must be used +# error On FreeBSD and Haiku API version 25 or greater must be used # endif # endif # include "fuse_common_compat.h" diff --git a/headers/private/userlandfs/fuse/fuse_compat.h b/headers/private/userlandfs/fuse/fuse_compat.h index 225276f5cf..ccf1be80c1 100644 --- a/headers/private/userlandfs/fuse/fuse_compat.h +++ b/headers/private/userlandfs/fuse/fuse_compat.h @@ -65,7 +65,7 @@ struct fuse *fuse_setup_compat25(int argc, char *argv[], void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint); -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__HAIKU__) #include struct fuse_operations_compat22 { @@ -198,4 +198,4 @@ struct fuse *fuse_new_compat1(int fd, int flags, void fuse_main_compat1(int argc, char *argv[], const struct fuse_operations_compat1 *op); -#endif /* __FreeBSD__ */ +#endif /* !__FreeBSD__ && !__HAIKU__ */ diff --git a/headers/private/userlandfs/fuse/fuse_lowlevel_compat.h b/headers/private/userlandfs/fuse/fuse_lowlevel_compat.h index aba45e6aa7..d808899fe4 100644 --- a/headers/private/userlandfs/fuse/fuse_lowlevel_compat.h +++ b/headers/private/userlandfs/fuse/fuse_lowlevel_compat.h @@ -72,7 +72,7 @@ size_t fuse_dirent_size(size_t namelen); char *fuse_add_dirent(char *buf, const char *name, const struct stat *stbuf, off_t off); -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__HAIKU__) #include @@ -139,7 +139,7 @@ struct fuse_session *fuse_lowlevel_new_compat(const char *opts, const struct fuse_lowlevel_ops_compat *op, size_t op_size, void *userdata); -#endif /* __FreeBSD__ */ +#endif /* !__FreeBSD__ && !__HAIKU__ */ struct fuse_chan_ops_compat24 { int (*receive)(struct fuse_chan *ch, char *buf, size_t size);