summaryrefslogtreecommitdiff
path: root/src/basic/def.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-01-02 13:12:18 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-02-18 10:25:25 +0100
commitf7767d76bb8598c31deb1c0122a7b17947b5df4f (patch)
treebe29b9a6e33a4cf995bd5dce5af4cd1f121ad88f /src/basic/def.h
parente0b8a238df5bded9d41d9adf4371123c1b99c1df (diff)
downloadsystemd-f7767d76bb8598c31deb1c0122a7b17947b5df4f.tar.gz
Introduce CONF_PATHS_USR_STRV to mirror CONF_PATHS_STRV
Diffstat (limited to 'src/basic/def.h')
-rw-r--r--src/basic/def.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/basic/def.h b/src/basic/def.h
index 5be018d82e..929da726ae 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -66,12 +66,20 @@
"/usr/lib/" n "\0" \
_CONF_PATHS_SPLIT_USR_NULSTR(n)
+#define CONF_PATHS_USR(n) \
+ "/etc/" n, \
+ "/run/" n, \
+ "/usr/local/lib/" n, \
+ "/usr/lib/" n
+
+#define CONF_PATHS(n) \
+ CONF_PATHS_USR(n) \
+ _CONF_PATHS_SPLIT_USR(n)
+
+#define CONF_PATHS_USR_STRV(n) \
+ STRV_MAKE(CONF_PATHS_USR(n))
+
#define CONF_PATHS_STRV(n) \
- STRV_MAKE( \
- "/etc/" n, \
- "/run/" n, \
- "/usr/local/lib/" n, \
- "/usr/lib/" n \
- _CONF_PATHS_SPLIT_USR(n))
+ STRV_MAKE(CONF_PATHS(n))
#define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL)