From a09abc4ae0bdc0200324eaa0416f23ff2170ec4e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 30 Oct 2014 18:32:37 +0100
Subject: [PATCH] memfd: rename memfd.h to memfd-util.h to avoid any confusion
 with any libc provided headers

---
 Makefile.am                                | 4 ++--
 src/journal/journal-send.c                 | 2 +-
 src/journal/journald-native.c              | 2 +-
 src/libsystemd/sd-bus/bus-message.c        | 2 +-
 src/libsystemd/sd-bus/test-bus-zero-copy.c | 2 +-
 src/shared/{memfd.c => memfd-util.c}       | 2 +-
 src/shared/{memfd.h => memfd-util.h}       | 0
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename src/shared/{memfd.c => memfd-util.c} (99%)
 rename src/shared/{memfd.h => memfd-util.h} (100%)

diff --git a/Makefile.am b/Makefile.am
index c80d25df2..69d598b4d 100644
--- 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 0ee83cdb7..887b957c4 100644
--- 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 d3735ec73..ace8d5cbf 100644
--- 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 0eea32b64..be36d9f41 100644
--- 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 e3010fbf7..e938a48b6 100644
--- 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 b55817795..21ecf4b32 100644
--- 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
-- 
2.30.2