Browse Source

Merge pull request #1129 from trapexit/fuse-version

Remove FUSE_USE_VERSION, no longer used
pull/1130/head
trapexit 2 years ago
committed by GitHub
parent
commit
e2ece936e6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      Makefile
  2. 1
      libfuse/Makefile
  3. 14
      libfuse/include/fuse.h
  4. 15
      libfuse/include/fuse_lowlevel.h
  5. 8
      tools/cppfind

3
Makefile

@ -79,8 +79,7 @@ CXXFLAGS := \
-MMD -MMD
FUSE_FLAGS = \ FUSE_FLAGS = \
-Ilibfuse/include \ -Ilibfuse/include \
-D_FILE_OFFSET_BITS=64 \
-DFUSE_USE_VERSION=29
-D_FILE_OFFSET_BITS=64
MFS_FLAGS = \ MFS_FLAGS = \
-DUSE_XATTR=$(USE_XATTR) \ -DUSE_XATTR=$(USE_XATTR) \
-DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK) -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)

1
libfuse/Makefile

@ -72,7 +72,6 @@ FUSE_FLAGS = \
-Ibuild \ -Ibuild \
-D_REENTRANT \ -D_REENTRANT \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-DFUSE_USE_VERSION=29 \
-DPACKAGE_VERSION=\"$(VERSION)\" \ -DPACKAGE_VERSION=\"$(VERSION)\" \
-DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\" -DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\"
LDFLAGS := \ LDFLAGS := \

14
libfuse/include/fuse.h

@ -9,20 +9,6 @@
#ifndef _FUSE_H_ #ifndef _FUSE_H_
#define _FUSE_H_ #define _FUSE_H_
/** @file
*
* 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.
*/
#ifndef FUSE_USE_VERSION
#define FUSE_USE_VERSION 21
#endif
#include "extern_c.h" #include "extern_c.h"
#include "fuse_common.h" #include "fuse_common.h"

15
libfuse/include/fuse_lowlevel.h

@ -9,21 +9,6 @@
#ifndef _FUSE_LOWLEVEL_H_ #ifndef _FUSE_LOWLEVEL_H_
#define _FUSE_LOWLEVEL_H_ #define _FUSE_LOWLEVEL_H_
/** @file
*
* Low level API
*
* 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 24 (default) or
* 25
*/
#include "fuse_msgbuf.h"
#ifndef FUSE_USE_VERSION
#define FUSE_USE_VERSION 24
#endif
#include "extern_c.h" #include "extern_c.h"
#include "fuse_common.h" #include "fuse_common.h"
#include "fuse_kernel.h" #include "fuse_kernel.h"

8
tools/cppfind

@ -1,8 +0,0 @@
#!/bin/sh
CXX="${CXX:-c++}"
FUSE_CFLAGS="-Ilibfuse/include -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=29"
echo "#include \"fuse.h\"" | ${CXX} -E ${FUSE_CFLAGS} - | grep "${1}" > /dev/null
[ "$?" != "0" ]; echo $?
Loading…
Cancel
Save