From: Miklos Szeredi Date: Thu, 19 Jul 2012 16:40:11 +0000 (+0200) Subject: Start of 3.0 series X-Git-Tag: fuse-3.0.0pre0~166 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2b4b5cc5449264448bce77bfb6788f1b675bf2fd;p=qemu-gpiodev%2Flibfuse.git Start of 3.0 series Change the version numbers. This is going to be a new major version of the library breaking backward compatibility on the binary level as well as the source level. --- diff --git a/ChangeLog b/ChangeLog index 679cbd2..5eeb9fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-07-19 Miklos Szeredi + + * Start of 3.0 series. This is going to be a new major version of + the library breaking backward compatibility on the binary level as + well as the source level. + 2012-07-19 Miklos Szeredi * Released 2.9.1 diff --git a/configure.in b/configure.in index fd4b80f..2a27ea0 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(fuse, 2.9.1) +AC_INIT(fuse, 3.0.0-pre0) AC_PREREQ(2.59d) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET diff --git a/example/cusexmp.c b/example/cusexmp.c index 01fcdf7..b69f97c 100644 --- a/example/cusexmp.c +++ b/example/cusexmp.c @@ -9,7 +9,7 @@ gcc -Wall cusexmp.c `pkg-config fuse --cflags --libs` -o cusexmp */ -#define FUSE_USE_VERSION 29 +#define FUSE_USE_VERSION 30 #include #include diff --git a/example/fioc.c b/example/fioc.c index bee40b9..849bd5d 100644 --- a/example/fioc.c +++ b/example/fioc.c @@ -9,7 +9,7 @@ gcc -Wall fioc.c `pkg-config fuse --cflags --libs` -o fioc */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include diff --git a/example/fsel.c b/example/fsel.c index 9cf0221..bddc1aa 100644 --- a/example/fsel.c +++ b/example/fsel.c @@ -9,7 +9,7 @@ gcc -Wall fsel.c `pkg-config fuse --cflags --libs` -o fsel */ -#define FUSE_USE_VERSION 29 +#define FUSE_USE_VERSION 30 #include #include diff --git a/example/fusexmp.c b/example/fusexmp.c index dca8a46..42a8134 100644 --- a/example/fusexmp.c +++ b/example/fusexmp.c @@ -9,7 +9,7 @@ gcc -Wall fusexmp.c `pkg-config fuse --cflags --libs` -o fusexmp */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #ifdef HAVE_CONFIG_H #include diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c index 1ba9dbc..2b0f616 100644 --- a/example/fusexmp_fh.c +++ b/example/fusexmp_fh.c @@ -9,7 +9,7 @@ gcc -Wall fusexmp_fh.c `pkg-config fuse --cflags --libs` -lulockmgr -o fusexmp_fh */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #ifdef HAVE_CONFIG_H #include diff --git a/example/hello.c b/example/hello.c index bcb6b4c..b31fbe5 100644 --- a/example/hello.c +++ b/example/hello.c @@ -8,7 +8,7 @@ gcc -Wall hello.c `pkg-config fuse --cflags --libs` -o hello */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include diff --git a/example/hello_ll.c b/example/hello_ll.c index 1405441..baf41bc 100644 --- a/example/hello_ll.c +++ b/example/hello_ll.c @@ -8,7 +8,7 @@ gcc -Wall hello_ll.c `pkg-config fuse --cflags --libs` -o hello_ll */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include diff --git a/example/null.c b/example/null.c index b72cf4d..4e2bb8f 100644 --- a/example/null.c +++ b/example/null.c @@ -8,7 +8,7 @@ gcc -Wall null.c `pkg-config fuse --cflags --libs` -o null */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include diff --git a/include/fuse.h b/include/fuse.h index c657e67..fb5b48b 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -13,16 +13,9 @@ * * This file defines the library interface of FUSE * - * IMPORTANT: you should define FUSE_USE_VERSION before including this - * header. To use the newest API define it to 26 (recommended for any - * new application), to use the old API define it to 21 (default) 22 - * or 25, to use the even older 1.X API define it to 11. + * IMPORTANT: you should define FUSE_USE_VERSION before including this header. */ -#ifndef FUSE_USE_VERSION -#define FUSE_USE_VERSION 21 -#endif - #include "fuse_common.h" #include diff --git a/include/fuse_common.h b/include/fuse_common.h index a4d980d..0ae33a9 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.h @@ -1,5 +1,4 @@ -/* - FUSE: Filesystem in Userspace +/* FUSE: Filesystem in Userspace Copyright (C) 2001-2007 Miklos Szeredi This program can be distributed under the terms of the GNU LGPLv2. @@ -20,10 +19,10 @@ #include /** Major version of FUSE library interface */ -#define FUSE_MAJOR_VERSION 2 +#define FUSE_MAJOR_VERSION 3 /** Minor version of FUSE library interface */ -#define FUSE_MINOR_VERSION 9 +#define FUSE_MINOR_VERSION 0 #define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min)) #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION) @@ -468,34 +467,8 @@ void fuse_remove_signal_handlers(struct fuse_session *se); * Compatibility stuff * * ----------------------------------------------------------- */ -#if FUSE_USE_VERSION < 26 -# ifdef __FreeBSD__ -# if FUSE_USE_VERSION < 25 -# error On FreeBSD API version 25 or greater must be used -# endif -# endif -# include "fuse_common_compat.h" -# undef FUSE_MINOR_VERSION -# undef fuse_main -# define fuse_unmount fuse_unmount_compat22 -# if FUSE_USE_VERSION == 25 -# define FUSE_MINOR_VERSION 5 -# define fuse_mount fuse_mount_compat25 -# elif FUSE_USE_VERSION == 24 || FUSE_USE_VERSION == 22 -# define FUSE_MINOR_VERSION 4 -# define fuse_mount fuse_mount_compat22 -# elif FUSE_USE_VERSION == 21 -# define FUSE_MINOR_VERSION 1 -# define fuse_mount fuse_mount_compat22 -# elif FUSE_USE_VERSION == 11 -# warning Compatibility with API version 11 is deprecated -# undef FUSE_MAJOR_VERSION -# define FUSE_MAJOR_VERSION 1 -# define FUSE_MINOR_VERSION 1 -# define fuse_mount fuse_mount_compat1 -# else -# error Compatibility with API version other than 21, 22, 24, 25 and 11 not supported -# endif +#if !defined(FUSE_USE_VERSION) || FUSE_USE_VERSION < 30 +# error only API version 30 or greater is supported #endif #ifdef __cplusplus diff --git a/lib/Makefile.am b/lib/Makefile.am index e2bdd97..8ec234a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \ - -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26 + -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=30 lib_LTLIBRARIES = libfuse.la libulockmgr.la @@ -36,7 +36,7 @@ libfuse_la_SOURCES = \ $(iconv_source) \ $(mount_source) -libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:1 \ +libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 3:0:0 \ -Wl,--version-script,$(srcdir)/fuse_versionscript if NETBSD diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c index 89b22e4..33923f3 100644 --- a/lib/modules/iconv.c +++ b/lib/modules/iconv.c @@ -6,7 +6,7 @@ See the file COPYING.LIB */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include diff --git a/lib/modules/subdir.c b/lib/modules/subdir.c index 76a53fa..3a76cbb 100644 --- a/lib/modules/subdir.c +++ b/lib/modules/subdir.c @@ -6,7 +6,7 @@ See the file COPYING.LIB */ -#define FUSE_USE_VERSION 26 +#define FUSE_USE_VERSION 30 #include #include