rename fuse_compat.h to avoid conflict with system header

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

diff --git a/src/Makefile.am b/src/Makefile.am
index 030d6b5ebd3332ab4021fa44957a59bf5e2b0eb2..e06dc352ef961756afc12f0b0769ac2c766980e4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ liblxcfs_la_SOURCES = api_extensions.h \
                      cgroups/cgroup2_devices.c cgroups/cgroup2_devices.h \
                      cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
                      cpuset_parse.c cpuset_parse.h \
+                     lxcfs_fuse_compat.h \
                      macro.h \
                      memory_utils.h \
                      proc_cpuview.c proc_cpuview.h \
@@ -44,6 +45,7 @@ liblxcfstest_la_SOURCES = api_extensions.h \
                          cgroups/cgroup2_devices.c cgroups/cgroup2_devices.h \
                          cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
                          cpuset_parse.c cpuset_parse.h \
+                         lxcfs_fuse_compat.h \
                          macro.h \
                          memory_utils.h \
                          proc_cpuview.c proc_cpuview.h \
@@ -72,6 +74,7 @@ noinst_HEADERS = api_extensions.h \
                 cgroups/cgroup2_devices.h \
                 cgroups/cgroup_utils.h \
                 cpuset_parse.h \
+                lxcfs_fuse_compat.h \
                 macro.h \
                 memory_utils.h \
                 proc_cpuview.h \

diff --git a/src/cgroup_fuse.c b/src/cgroup_fuse.c
index b9d09f93f10fe0236ac769d188aa11f5ba4cf602..d33cf476b91a0b55bd3fef035f9f9b6a432a3d54 100644 (file)
--- a/src/cgroup_fuse.c
+++ b/src/cgroup_fuse.c
@@ -50,7 +50,7 @@
 #include "bindings.h"
 #include "cgroups/cgroup.h"
 #include "cgroups/cgroup_utils.h"
-#include "fuse_compat.h"
+#include "lxcfs_fuse_compat.h"
 #include "memory_utils.h"
 #include "utils.h"
 

diff --git a/src/fuse_compat.h b/src/fuse_compat.h
deleted file mode 100644 (file)
index a610e7e..0000000
--- a/src/fuse_compat.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-
-#ifndef __LXC_FUSE_COMPAT_H
-#define __LXC_FUSE_COMPAT_H
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifdef HAVE_FUSE3
-#define DIR_FILLER(F,B,N,S,O) F(B,N,S,O,FUSE_FILL_DIR_PLUS)
-#else
-#define DIR_FILLER(F,B,N,S,O) F(B,N,S,O)
-#endif
-#endif /* __LXC_FUSE_COMPAT_H */

diff --git a/src/lxcfs.c b/src/lxcfs.c
index b2eb51ec6ad23738e537e039778fd6df4d3a9579..d186aa3baa3a577f20913936ceefa9c330033457 100644 (file)
--- a/src/lxcfs.c
+++ b/src/lxcfs.c
@@ -41,7 +41,7 @@
 #include <linux/limits.h>
 
 #include "bindings.h"
-#include "fuse_compat.h"
+#include "lxcfs_fuse_compat.h"
 #include "macro.h"
 #include "memory_utils.h"
 

diff --git a/src/lxcfs_fuse_compat.h b/src/lxcfs_fuse_compat.h
new file mode 100644 (file)
index 0000000..9c61af0
--- /dev/null
+++ b/src/lxcfs_fuse_compat.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXCFS_FUSE_COMPAT_H
+#define __LXCFS_FUSE_COMPAT_H
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#ifdef HAVE_FUSE3
+#define DIR_FILLER(F,B,N,S,O) F(B,N,S,O,FUSE_FILL_DIR_PLUS)
+#else
+#define DIR_FILLER(F,B,N,S,O) F(B,N,S,O)
+#endif
+#endif /* __LXCFS_FUSE_COMPAT_H */

diff --git a/src/proc_fuse.c b/src/proc_fuse.c
index 0211e1dd5bce6bac7cde9c26acf2f5fcb3127253..882d93e673cf17ac3f2d08b61caf914268b5eead 100644 (file)
--- a/src/proc_fuse.c
+++ b/src/proc_fuse.c
@@ -52,7 +52,7 @@
 #include "cgroups/cgroup.h"
 #include "cgroups/cgroup_utils.h"
 #include "cpuset_parse.h"
-#include "fuse_compat.h"
+#include "lxcfs_fuse_compat.h"
 #include "memory_utils.h"
 #include "proc_loadavg.h"
 #include "proc_cpuview.h"

diff --git a/src/sysfs_fuse.c b/src/sysfs_fuse.c
index 575e932389ee44999e7f5a64fca3557da2821725..cddf17c3fedd374316bd3dfade1b729078669a62 100644 (file)
--- a/src/sysfs_fuse.c
+++ b/src/sysfs_fuse.c
@@ -49,7 +49,7 @@
 #include "bindings.h"
 #include "memory_utils.h"
 #include "cgroups/cgroup.h"
-#include "fuse_compat.h"
+#include "lxcfs_fuse_compat.h"
 #include "sysfs_fuse.h"
 #include "utils.h"