From ee104e11e303499a637c5cd8157bd12ad5cc116d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Oct 2015 00:42:07 +0100
Subject: user-util: move UID/GID related macros from macro.h to user-util.h

---
 src/libsystemd/sd-bus/bus-control.c       | 3 ++-
 src/libsystemd/sd-bus/bus-creds.c         | 1 +
 src/libsystemd/sd-bus/bus-kernel.c        | 1 +
 src/libsystemd/sd-device/device-private.c | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/libsystemd')

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index dc4ac88712..7c9dcf5283 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -29,13 +29,14 @@
 #include "sd-bus.h"
 
 #include "bus-bloom.h"
+#include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "capability-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "bus-control.h"
+#include "user-util.h"
 
 _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
         int r;
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index d291da8934..7c99904c64 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -38,6 +38,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "user-util.h"
 #include "util.h"
 
 enum {
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index a455259007..a32b0ef221 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -48,6 +48,7 @@
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "user-util.h"
 #include "util.h"
 
 #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index daed321bd8..69288b833e 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -41,6 +41,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "strxcpyx.h"
+#include "user-util.h"
 #include "util.h"
 
 int device_add_property(sd_device *device, const char *key, const char *value) {
-- 
cgit v1.2.3-54-g00ecf