diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
| commit | e3c4a681db0b7004904b95d55fd1a443161c9397 (patch) | |
| tree | a5b08abba6a533a3c4fc2a8f1bb9097957580c46 /src/basic/def.h | |
| parent | 092b6e188b6b75be4450c6f20fc82599dcaf9552 (diff) | |
| parent | de7399eb7427da46c5cd355181080274f69567a2 (diff) | |
Merge pull request #1835 from poettering/grabbag-of-stuff
Lots of small fixes
Diffstat (limited to 'src/basic/def.h')
| -rw-r--r-- | src/basic/def.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index 950f693899..0657ac7367 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -76,17 +76,19 @@ #define NOTIFY_FD_MAX 768 #define NOTIFY_BUFFER_MAX PIPE_BUF -/* Return a nulstr for a standard cascade of configuration directories, - * suitable to pass to conf_files_list_nulstr or config_parse_many. */ -#define CONF_DIRS_NULSTR(n) \ - "/etc/" n ".d\0" \ - "/run/" n ".d\0" \ - "/usr/local/lib/" n ".d\0" \ - "/usr/lib/" n ".d\0" \ - CONF_DIR_SPLIT_USR(n) - #ifdef HAVE_SPLIT_USR -#define CONF_DIR_SPLIT_USR(n) "/lib/" n ".d\0" +#define _CONF_PATHS_SPLIT_USR(n) "/lib/" n "\0" #else -#define CONF_DIR_SPLIT_USR(n) +#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) |