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

Let's not have a file with a single define.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-10-24 11:18:35 +02:00
parent 8a2c82ac88
commit 0e7f5ad9d3
5 changed files with 7 additions and 10 deletions

View File

@ -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", \
}

View File

@ -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

View File

@ -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", \
}

View File

@ -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"

View File

@ -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"