revert to version 2.6

This commit is contained in:
Miklos Szeredi 2006-01-23 17:11:24 +00:00
parent f8277506f4
commit 83deefd65f
7 changed files with 10 additions and 17 deletions

View File

@ -1,4 +1,4 @@
AC_INIT(fuse, 2.7.0-pre0)
AC_INIT(fuse, 2.6.0-pre0)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(include/config.h)

View File

@ -547,7 +547,7 @@ void fuse_set_getcontext_func(struct fuse_context *(*func)(void));
# undef FUSE_MINOR_VERSION
# undef fuse_main
# if FUSE_USE_VERSION == 25
# define FUSE_MINOR_VERSION 6
# define FUSE_MINOR_VERSION 5
# define fuse_main(argc, argv, op) \
fuse_main_real_compat25(argc, argv, op, sizeof(*(op)))
# define fuse_new fuse_new_compat25
@ -590,7 +590,7 @@ void fuse_set_getcontext_func(struct fuse_context *(*func)(void));
# define FUSE_DEBUG FUSE_DEBUG_COMPAT1
# endif
# endif
#elif FUSE_USE_VERSION < 27
#elif FUSE_USE_VERSION < 26
# error Compatibility with API version other than 21, 22, 25 and 11 not supported
#endif

View File

@ -20,7 +20,7 @@
#define FUSE_MAJOR_VERSION 2
/** Minor version of FUSE library interface */
#define FUSE_MINOR_VERSION 7
#define FUSE_MINOR_VERSION 6
#define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min))
#define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)

View File

@ -1245,7 +1245,7 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
# include "fuse_lowlevel_compat.h"
# undef FUSE_MINOR_VERSION
# if FUSE_USE_VERSION == 25
# define FUSE_MINOR_VERSION 6
# define FUSE_MINOR_VERSION 5
# define fuse_lowlevel_ops fuse_lowlevel_ops_compat25
# define fuse_lowlevel_new fuse_lowlevel_new_compat25
# else
@ -1254,7 +1254,7 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
# define fuse_reply_statfs fuse_reply_statfs_compat
# define fuse_reply_open fuse_reply_open_compat
# endif
#elif FUSE_USE_VERSION < 27
#elif FUSE_USE_VERSION < 26
# error Compatibility with low level API version other than 24 and 25 not supported
#endif

View File

@ -1,4 +1,4 @@
AC_INIT(fuse-kernel, 2.7.0-pre0)
AC_INIT(fuse-kernel, 2.6.0-pre0)
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL

View File

@ -22,7 +22,7 @@ libfuse_la_SOURCES = \
helper.c \
$(mount_source)
libfuse_la_LDFLAGS = -lpthread -version-number 2:7:0 \
libfuse_la_LDFLAGS = -lpthread -version-number 2:6:0 \
-Wl,--version-script,fuse_versionscript
EXTRA_DIST = fuse_versionscript

View File

@ -84,11 +84,6 @@ FUSE_2.5 {
} FUSE_2.4;
FUSE_2.6 {
global:
fuse_opt_insert_arg;
} FUSE_2.5;
FUSE_2.7 {
global:
fuse_lowlevel_new;
fuse_lowlevel_new_compat25;
@ -96,9 +91,7 @@ FUSE_2.7 {
fuse_main_real_compat25;
fuse_new;
fuse_new_compat25;
fuse_opt_insert_arg;
fuse_setup;
fuse_setup_compat25;
local:
*;
} FUSE_2.6;
} FUSE_2.5;