From 45c5db5475d2aa0a73675f3a5129523f82adfc18 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 11 Aug 2005 15:48:10 +0000 Subject: fix --- include/fuse.h | 15 --------------- include/fuse_common.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/fuse.h b/include/fuse.h index ade49f5..ca96084 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -16,21 +16,6 @@ new application), to use the old API define it to 21 (this is the default), to use the even older 1.X API define it to 11. */ -#ifndef FUSE_USE_VERSION -#define FUSE_USE_VERSION 21 -#endif - -/** Major version of FUSE library interface */ -#define FUSE_MAJOR_VERSION 2 - -/** Minor version of FUSE library interface */ -#define FUSE_MINOR_VERSION 4 - -/* This interface uses 64 bit off_t */ -#if _FILE_OFFSET_BITS != 64 -#error Please add -D_FILE_OFFSET_BITS=64 to your compile flags! -#endif - #include "fuse_common.h" #include diff --git a/include/fuse_common.h b/include/fuse_common.h index bb120d2..648d6e4 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.h @@ -13,6 +13,24 @@ #ifndef _FUSE_COMMON_H_ #define _FUSE_COMMON_H_ +#ifndef FUSE_USE_VERSION +#define FUSE_USE_VERSION 21 +#endif + +/** Major version of FUSE library interface */ +#define FUSE_MAJOR_VERSION 2 + +/** Minor version of FUSE library interface */ +#define FUSE_MINOR_VERSION 4 + +#define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min)) +#define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION) + +/* This interface uses 64 bit off_t */ +#if _FILE_OFFSET_BITS != 64 +#error Please add -D_FILE_OFFSET_BITS=64 to your compile flags! +#endif + /** Information about open files */ struct fuse_file_info { /** Open flags. Available in open() and release() */ -- cgit v1.2.3