Prep v228: Add remaining updates from upstream (2/3)

[elogind.git] / src / basic / def.h

diff --git a/src/basic/def.h b/src/basic/def.h
index 561dab66e84cfcf3e77b7b46e833441c07fbec9a..b6541420ae04a4c0c2a943713b0b8def041c602a 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -80,3 +80,20 @@
 
 #define NOTIFY_FD_MAX 768
 #define NOTIFY_BUFFER_MAX PIPE_BUF
+
+#ifdef HAVE_SPLIT_USR
+#define _CONF_PATHS_SPLIT_USR(n) "/lib/" n "\0"
+#else
+#define _CONF_PATHS_SPLIT_USR(n)
+#endif
+
+/* Return a nulstr for a standard cascade of configuration paths,
+ * suitable to pass to conf_files_list_nulstr() or config_parse_many()
+ * to implement drop-in directories for extending configuration
+ * files. */
+#define CONF_PATHS_NULSTR(n) \
+        "/etc/" n "\0" \
+        "/run/" n "\0" \
+        "/usr/local/lib/" n "\0" \
+        "/usr/lib/" n "\0" \
+        _CONF_PATHS_SPLIT_USR(n)