diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-06 14:55:07 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-04-26 12:59:13 +0200 |
| commit | eaca07ccfdf5d7dabc50afc7e539c2413dd69d3e (patch) | |
| tree | f2876260f754b2c3f86814980568e6142cffafcd /src/basic/def.h | |
| parent | b96ed50e3493103d075ff2ce4c3fbad8f26b2e22 (diff) | |
Prep v228: Add remaining updates from upstream (2/3)
Apply remaining fixes and the performed move of utility functions
into their own foo-util.[hc] files on libbasic.
Diffstat (limited to 'src/basic/def.h')
| -rw-r--r-- | src/basic/def.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index 561dab66e..b6541420a 100644 --- 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) |