tree-wide: use a single fuse header

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

diff --git a/src/api_extensions.h b/src/api_extensions.h
index 9ee55dafc2d79b95e73b294c4b887eb37a803dce..77f69e716d1d0dd818482a5bac4a071a8f0c0b47 100644 (file)
--- a/src/api_extensions.h
+++ b/src/api_extensions.h
@@ -3,11 +3,11 @@
 #ifndef __LXCFS_API_EXTENSIONS_H
 #define __LXCFS_API_EXTENSIONS_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 /*
  * api_extensions is the list of all API extensions in the order they were
  * added.

diff --git a/src/bindings.h b/src/bindings.h
index 4e033628b224d2658db6783c5b6e19f1d67fa722..a278aa7a6899a9530b85ff086ac21ca18675de07 100644 (file)
--- a/src/bindings.h
+++ b/src/bindings.h
@@ -14,11 +14,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "cgroup_fuse.h"
 #include "macro.h"

diff --git a/src/cgroup_fuse.h b/src/cgroup_fuse.h
index 494dac70515f1867ab0ad53a00f4933c0cdcb4f5..c2315230adc3dce7f104ac0a9c285a137cb94687 100644 (file)
--- a/src/cgroup_fuse.h
+++ b/src/cgroup_fuse.h
@@ -11,11 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "macro.h"
 

diff --git a/src/lxcfs.c b/src/lxcfs.c
index 307f5c6b9a4b3d8466463ad58e7aa13b60ab0e9e..5635596772bb52d08e5429c8d08037c7c16ab7e8 100644 (file)
--- a/src/lxcfs.c
+++ b/src/lxcfs.c
@@ -24,11 +24,7 @@
 #include <sys/socket.h>
 #include <linux/limits.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "bindings.h"
 #include "lxcfs_fuse_compat.h"

diff --git a/src/lxcfs_fuse.h b/src/lxcfs_fuse.h
new file mode 100644 (file)
index 0000000..e4b2c1e
--- /dev/null
+++ b/src/lxcfs_fuse.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXCFS_FUSE_H
+#define __LXCFS_FUSE_H
+
+#include "config.h"
+
+#include "lxcfs_fuse_compat.h"
+
+#if HAVE_FUSE3
+#include <fuse3/fuse.h>
+#else
+#include <fuse.h>
+#endif
+
+#endif /* __LXCFS_FUSE_H */

diff --git a/src/memory_utils.h b/src/memory_utils.h
index 2916f566289a5ef7c0fd83cedaa94132c12dd821..c689c8ec677fcc0eec17f43c42900f385d9a0216 100644 (file)
--- a/src/memory_utils.h
+++ b/src/memory_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXCFS_MEMORY_UTILS_H
 #define __LXCFS_MEMORY_UTILS_H
 
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/src/proc_cpuview.h b/src/proc_cpuview.h
index 15511e96be292aaa4c0fa8d488e72e01eab6b4b8..32eee5406249271fce723d56305609ab61407323 100644 (file)
--- a/src/proc_cpuview.h
+++ b/src/proc_cpuview.h
@@ -10,11 +10,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "macro.h"
 

diff --git a/src/proc_fuse.h b/src/proc_fuse.h
index 2c1f5727058e972cbb93e9f99bc625ebe16ec098..c97d60c7dcc35ea15fadc11da109f7504f301a09 100644 (file)
--- a/src/proc_fuse.h
+++ b/src/proc_fuse.h
@@ -5,11 +5,7 @@
 
 #include "config.h"
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/proc_loadavg.h b/src/proc_loadavg.h
index bb6a78b1aefbd8b794a1d0dda65f4aa413c0db25..e6ae2dedc1041814c014e5f45196aa7c3102851e 100644 (file)
--- a/src/proc_loadavg.h
+++ b/src/proc_loadavg.h
@@ -11,11 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "macro.h"
 

diff --git a/src/sysfs_fuse.h b/src/sysfs_fuse.h
index f151af7fb3c581a109e04d483c5035675dfafdcc..a80d3d82e87cbcc04d3347c78ef267ea4801de8e 100644 (file)
--- a/src/sysfs_fuse.h
+++ b/src/sysfs_fuse.h
@@ -11,11 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "macro.h"
 

diff --git a/src/utils.h b/src/utils.h
index e19eba49bcdac19a07cc3ddc8497d0ab20b8625d..18d85a739d8b9878d1bc22f4393cb3591c4ac6ca 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -13,11 +13,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#if HAVE_FUSE3
-#include <fuse3/fuse.h>
-#else
-#include <fuse.h>
-#endif
+#include "lxcfs_fuse.h"
 
 #include "macro.h"
 #include "syscall_numbers.h"