diff options
| author | Bill Zissimopoulos <billziss@navimatics.com> | 2019-12-31 01:58:57 -0800 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2019-12-31 09:58:57 +0000 |
| commit | abdd45f83cea86410536d9a45aa317cc0511d9d2 (patch) | |
| tree | b8a43cbf6954caca556b9219f8bafa107b4ac66b /include/fuse.h | |
| parent | b5060b0642f6f97a934c4fc6a8d4dcd84d454fe7 (diff) | |
| download | libfuse-abdd45f83cea86410536d9a45aa317cc0511d9d2.tar.gz | |
Make ioctl prototype conditional on FUSE_USE_VERSION. (#482)
Define FUSE_USE_VERSION < 35 to get old ioctl prototype
with int commands; define FUSE_USE_VERSION >= 35 to get
new ioctl prototype with unsigned int commands.
Fixes #463.
Diffstat (limited to 'include/fuse.h')
| -rw-r--r-- | include/fuse.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/fuse.h b/include/fuse.h index 883f6e5..4522f83 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -680,8 +680,13 @@ struct fuse_operations { * Note : the unsigned long request submitted by the application * is truncated to 32 bits. */ +#if FUSE_USE_VERSION < 35 + int (*ioctl) (const char *, int cmd, void *arg, + struct fuse_file_info *, unsigned int flags, void *data); +#else int (*ioctl) (const char *, unsigned int cmd, void *arg, struct fuse_file_info *, unsigned int flags, void *data); +#endif /** * Poll for IO readiness events @@ -1189,9 +1194,15 @@ int fuse_fs_removexattr(struct fuse_fs *fs, const char *path, const char *name); int fuse_fs_bmap(struct fuse_fs *fs, const char *path, size_t blocksize, uint64_t *idx); +#if FUSE_USE_VERSION < 35 +int fuse_fs_ioctl(struct fuse_fs *fs, const char *path, int cmd, + void *arg, struct fuse_file_info *fi, unsigned int flags, + void *data); +#else int fuse_fs_ioctl(struct fuse_fs *fs, const char *path, unsigned int cmd, void *arg, struct fuse_file_info *fi, unsigned int flags, void *data); +#endif int fuse_fs_poll(struct fuse_fs *fs, const char *path, struct fuse_file_info *fi, struct fuse_pollhandle *ph, unsigned *reventsp); |