memfd: rename memfd.h to memfd-util.h to avoid any confusion with any libc provided...

diff --git a/Makefile.am b/Makefile.am
index c80d25df29b0a62d73eff9ec57725baf3ecb14ff..69d598b4d3b01e4596f5d3694d7246f38c4d997b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -881,8 +881,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
-       src/shared/memfd.c \
-       src/shared/memfd.h \
+       src/shared/memfd-util.c \
+       src/shared/memfd-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
        src/shared/nss-util.h

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 0ee83cdb778fc75421049697b6864c6f6d64be12..887b957c4d3751c14287f374b679ecb6903226b1 100644 (file)
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -32,7 +32,7 @@
 #include "sd-journal.h"
 #include "util.h"
 #include "socket-util.h"
-#include "memfd.h"
+#include "memfd-util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 

diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index d3735ec73c598706516355aae48239c81afc7bb4..ace8d5cbfd40b93b93414fbe29b24d520b06096d 100644 (file)
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -33,7 +33,7 @@
 #include "journald-console.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
-#include "memfd.h"
+#include "memfd-util.h"
 
 bool valid_user_field(const char *p, size_t l, bool allow_protected) {
         const char *a;

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 0eea32b649e08cd6299f85faee6a7c8e56ff7016..be36d9f417cac8e47306930921a1258e1bb506a1 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -28,7 +28,7 @@
 #include "strv.h"
 #include "time-util.h"
 #include "cgroup-util.h"
-#include "memfd.h"
+#include "memfd-util.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"

diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index e3010fbf7e5689ccabd8b7cdb3caa9a36e4e3d95..e938a48b639afd68a0d91b24d12842a0e6989dcf 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c
@@ -24,7 +24,7 @@
 
 #include "util.h"
 #include "log.h"
-#include "memfd.h"
+#include "memfd-util.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"

diff --git a/src/shared/memfd.c b/src/shared/memfd-util.c
similarity index 99%
rename from src/shared/memfd.c
rename to src/shared/memfd-util.c
index b55817795162637a80061cca63628f30c003f463..21ecf4b32bb606f228a7d3c012c3ccbb5a604fca 100644 (file)
--- a/src/shared/memfd.c
+++ b/src/shared/memfd-util.c
@@ -31,7 +31,7 @@
 
 #include "util.h"
 #include "bus-label.h"
-#include "memfd.h"
+#include "memfd-util.h"
 #include "utf8.h"
 #include "missing.h"
 

diff --git a/src/shared/memfd.h b/src/shared/memfd-util.h
similarity index 100%
rename from src/shared/memfd.h
rename to src/shared/memfd-util.h