diff options
| author | Pino Toscano <toscano.pino@tiscali.it> | 2013-03-23 15:18:08 +0100 |
|---|---|---|
| committer | Pino Toscano <toscano.pino@tiscali.it> | 2013-03-23 15:18:08 +0100 |
| commit | 6c57dfe77138ccbccdce29ce2e2b45a71dbbed73 (patch) | |
| tree | 039f62f682c3f26f9ae7588483d077b25e2ec341 | |
| parent | 3f5e67633de9c07f99967edf00bf9a3efdc65f62 (diff) | |
Reject compatibility versions less than 25
The code handling that has been previously removed.
* include/fuse_common.h [FUSE_USE_VERSION < 26] [__FreeBSD__]:
Change condition to [defined __FreeBSD__ || defined __GNU__].
* include/fuse_compat.h [!__FreeBSD__]: Change condition to
[!__FreeBSD__ && !__GNU__].
| -rw-r--r-- | include/fuse_common.h | 4 | ||||
| -rw-r--r-- | include/fuse_compat.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/fuse_common.h b/include/fuse_common.h index 8dc7bc25a..1d71060be 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.h @@ -193,9 +193,9 @@ void fuse_remove_signal_handlers(struct fuse_session *se); * ----------------------------------------------------------- */ #if FUSE_USE_VERSION < 26 -# ifdef __FreeBSD__ +# if defined(__FreeBSD__) || defined(__GNU__) # if FUSE_USE_VERSION < 25 -# error On FreeBSD API version 25 or greater must be used +# error On FreeBSD and Hurd API version 25 or greater must be used # endif # endif # include "fuse_common_compat.h" diff --git a/include/fuse_compat.h b/include/fuse_compat.h index b67f30e00..591094e3e 100644 --- a/include/fuse_compat.h +++ b/include/fuse_compat.h @@ -64,7 +64,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(__GNU__) #include <sys/statfs.h> struct fuse_operations_compat22 { @@ -190,4 +190,4 @@ struct fuse *fuse_new_compat1(int fd, int flags, const struct fuse_operations_co void fuse_main_compat1(int argc, char *argv[], const struct fuse_operations_compat1 *op); -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __GNU__ */ |