From a4491169b01ab246b4c813b4cdadb317ed7a5a16 Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Sun, 29 Jan 2023 17:04:08 -0500
Subject: [PATCH] Remove FUSE_USE_VERSION, no longer used

---
 Makefile                        |  3 +--
 libfuse/Makefile                |  1 -
 libfuse/include/fuse.h          | 14 --------------
 libfuse/include/fuse_lowlevel.h | 15 ---------------
 tools/cppfind                   |  8 --------
 5 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100755 tools/cppfind

diff --git a/Makefile b/Makefile
index cd614eec..14b551fa 100644
--- a/Makefile
+++ b/Makefile
@@ -79,8 +79,7 @@ CXXFLAGS    := \
               -MMD
 FUSE_FLAGS = \
               -Ilibfuse/include \
-              -D_FILE_OFFSET_BITS=64 \
-              -DFUSE_USE_VERSION=29
+              -D_FILE_OFFSET_BITS=64
 MFS_FLAGS  = \
 	      -DUSE_XATTR=$(USE_XATTR) \
 	      -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
diff --git a/libfuse/Makefile b/libfuse/Makefile
index eb20b685..35aa96c7 100644
--- a/libfuse/Makefile
+++ b/libfuse/Makefile
@@ -72,7 +72,6 @@ FUSE_FLAGS = \
 	-Ibuild \
 	-D_REENTRANT \
 	-D_FILE_OFFSET_BITS=64 \
-	-DFUSE_USE_VERSION=29 \
 	-DPACKAGE_VERSION=\"$(VERSION)\" \
 	-DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\"
 LDFLAGS := \
diff --git a/libfuse/include/fuse.h b/libfuse/include/fuse.h
index 32e5ca88..cb2ec1f0 100644
--- a/libfuse/include/fuse.h
+++ b/libfuse/include/fuse.h
@@ -9,20 +9,6 @@
 #ifndef _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 "fuse_common.h"
 
diff --git a/libfuse/include/fuse_lowlevel.h b/libfuse/include/fuse_lowlevel.h
index 8785968b..99524e15 100644
--- a/libfuse/include/fuse_lowlevel.h
+++ b/libfuse/include/fuse_lowlevel.h
@@ -9,21 +9,6 @@
 #ifndef _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 "fuse_common.h"
 #include "fuse_kernel.h"
diff --git a/tools/cppfind b/tools/cppfind
deleted file mode 100755
index 51c99029..00000000
--- a/tools/cppfind
+++ /dev/null
@@ -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 $?