tree-wide: fix fuse header inclusion

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/bindings.c b/src/bindings.c
index c6bec00e6b54aa79bc992fc8265eb1ebc203c974..a874aab4ec6e27d1b2e2928d4c877071793e911c 100644 (file)
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -9,7 +9,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <linux/magic.h>

diff --git a/src/bindings.h b/src/bindings.h
index e6b12b8a813e9ff73dc44381a4d7b63726b09636..4e033628b224d2658db6783c5b6e19f1d67fa722 100644 (file)
--- a/src/bindings.h
+++ b/src/bindings.h
@@ -5,7 +5,6 @@
 
 #include "config.h"
 
-#include <fuse.h>
 #include <linux/types.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -15,6 +14,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "cgroup_fuse.h"
 #include "macro.h"
 #include "proc_cpuview.h"

diff --git a/src/cgroup_fuse.c b/src/cgroup_fuse.c
index 46952a2ec42169b6322b11a5bc150d678a9f3757..d24b4c7bd614b90f65d63492433d1c1a250a2abe 100644 (file)
--- a/src/cgroup_fuse.c
+++ b/src/cgroup_fuse.c
@@ -10,7 +10,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>

diff --git a/src/cgroup_fuse.h b/src/cgroup_fuse.h
index f7b82f7d59524b1f06cca01414a5a591bcbc74cc..494dac70515f1867ab0ad53a00f4933c0cdcb4f5 100644 (file)
--- a/src/cgroup_fuse.h
+++ b/src/cgroup_fuse.h
@@ -5,13 +5,18 @@
 
 #include "config.h"
 
-#include <fuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "macro.h"
 
 __visible extern int cg_getattr(const char *path, struct stat *sb);

diff --git a/src/lxcfs.c b/src/lxcfs.c
index 57d139c8537c75047c68336e6f67b5151d5460fa..8978ab28eb0307373274f15e5bb908648b61f531 100644 (file)
--- a/src/lxcfs.c
+++ b/src/lxcfs.c
@@ -11,7 +11,6 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <getopt.h>
 #include <libgen.h>
 #include <pthread.h>
@@ -29,6 +28,12 @@
 #include <sys/socket.h>
 #include <linux/limits.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "bindings.h"
 #include "lxcfs_fuse_compat.h"
 #include "macro.h"

diff --git a/src/proc_cpuview.c b/src/proc_cpuview.c
index e842447540b1433dafa56b8833ab490c7b714b37..f8af1e24ed2f9f577a826c4160ee58ca00eb1500 100644 (file)
--- a/src/proc_cpuview.c
+++ b/src/proc_cpuview.c
@@ -10,7 +10,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>

diff --git a/src/proc_cpuview.h b/src/proc_cpuview.h
index 2e067b5e8496e99fc9d93bf8dd50f614ebe1720c..15511e96be292aaa4c0fa8d488e72e01eab6b4b8 100644 (file)
--- a/src/proc_cpuview.h
+++ b/src/proc_cpuview.h
@@ -10,6 +10,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "macro.h"
 
 struct cpuacct_usage {

diff --git a/src/proc_fuse.c b/src/proc_fuse.c
index 333e0f2460baf7cd23ea6e12c60d60b26447bd5e..cbbcad2d21f6cb3713e0ebc8e56b649c14a29041 100644 (file)
--- a/src/proc_fuse.c
+++ b/src/proc_fuse.c
@@ -10,7 +10,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>

diff --git a/src/proc_fuse.h b/src/proc_fuse.h
index 72615b6c36ba26c318d4b886bd5f0bb1bed70bb8..2c1f5727058e972cbb93e9f99bc625ebe16ec098 100644 (file)
--- a/src/proc_fuse.h
+++ b/src/proc_fuse.h
@@ -5,8 +5,12 @@
 
 #include "config.h"
 
-
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
 #include <fuse.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>

diff --git a/src/proc_loadavg.c b/src/proc_loadavg.c
index 12b8051b7a8892c1bb87278386cacf126ce0b0df..05c0659e32ab2d82de2283a3551f1938cc7b557d 100644 (file)
--- a/src/proc_loadavg.c
+++ b/src/proc_loadavg.c
@@ -10,7 +10,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>

diff --git a/src/proc_loadavg.h b/src/proc_loadavg.h
index db87ca89a1002002360584943a49db30f520ebee..bb6a78b1aefbd8b794a1d0dda65f4aa413c0db25 100644 (file)
--- a/src/proc_loadavg.h
+++ b/src/proc_loadavg.h
@@ -5,13 +5,18 @@
 
 #include "config.h"
 
-#include <fuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "macro.h"
 
 __visible extern pthread_t load_daemon(int load_use);

diff --git a/src/sysfs_fuse.c b/src/sysfs_fuse.c
index 667863c8afb7772c13e58e00b3241bf92d304a27..2f20ef21fcb6b3a82d492192e2eb5668052cec20 100644 (file)
--- a/src/sysfs_fuse.c
+++ b/src/sysfs_fuse.c
@@ -16,7 +16,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>

diff --git a/src/sysfs_fuse.h b/src/sysfs_fuse.h
index a4908fe517a7d53896cb1e8a259b49aaa5b7517f..f151af7fb3c581a109e04d483c5035675dfafdcc 100644 (file)
--- a/src/sysfs_fuse.h
+++ b/src/sysfs_fuse.h
@@ -11,6 +11,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "macro.h"
 
 __visible extern int sys_getattr(const char *path, struct stat *sb);

diff --git a/src/utils.c b/src/utils.c
index 9d1693bd73a35688a97407fb3be49b4e687c154f..fc5271b61b880ae7449ae121ae5a3426c0615d30 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -10,7 +10,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fuse.h>
 #include <inttypes.h>
 #include <sched.h>
 #include <stdarg.h>

diff --git a/src/utils.h b/src/utils.h
index 04eedbe73e0915b0d1b9010d2927e9e855f7a52d..6c1226dfdd7b29733eb994319ea7892030a8bcd5 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -5,7 +5,6 @@
 
 #include "config.h"
 
-#include <fuse.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <sys/socket.h>
@@ -14,6 +13,12 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
 #include "macro.h"
 #include "syscall_numbers.h"