Move PLYMOUTH_SOCKET define to def.h and nuke plymouth-util.h

Let's not have a file with a single define.

diff --git a/src/basic/def.h b/src/basic/def.h
index 2af0b76..970654a 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -58,3 +58,8 @@
         STRV_MAKE(CONF_PATHS(n))
 
 #define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL)
+
+#define PLYMOUTH_SOCKET {                                       \
+                .un.sun_family = AF_UNIX,                       \
+                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
+        }

diff --git a/src/basic/meson.build b/src/basic/meson.build
index b23ca58..85795d4 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -162,7 +162,6 @@ basic_sources = files('''
         parse-util.h
         path-util.c
         path-util.h
-        plymouth-util.h
         prioq.c
         prioq.h
         proc-cmdline.c

diff --git a/src/basic/plymouth-util.h b/src/basic/plymouth-util.h
deleted file mode 100644 (file)
index 27b5eb2..0000000
--- a/src/basic/plymouth-util.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-#pragma once
-
-#define PLYMOUTH_SOCKET {                                       \
-                .un.sun_family = AF_UNIX,                       \
-                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
-        }

diff --git a/src/core/manager.c b/src/core/manager.c
index 5f3cb6e..295ab48 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -35,6 +35,7 @@
 #include "dbus-manager.h"
 #include "dbus-unit.h"
 #include "dbus.h"
+#include "def.h"
 #include "dirent-util.h"
 #include "env-util.h"
 #include "escape.h"
@@ -58,7 +59,6 @@
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
-#include "plymouth-util.h"
 #include "process-util.h"
 #include "ratelimit.h"
 #include "rlimit-util.h"

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index a08a53d..418288a 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -24,6 +24,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
@@ -34,7 +35,6 @@
 #include "memory-util.h"
 #include "missing.h"
 #include "mkdir.h"
-#include "plymouth-util.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "signal-util.h"