diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-03 17:53:15 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-03 17:53:15 +0100 |
| commit | 5604b971cf16bd936570d7496c01ce0bd8348632 (patch) | |
| tree | cf4124bf2346ec37f07c07965ff2a5989f5f031e /src/basic/def.h | |
| parent | 5703176d6e9680c32caac1de2d6bdb84cdc72c96 (diff) | |
| parent | 119e9655dc36f18ed74f9a256d5c693b5aeb43ab (diff) | |
Merge pull request #1767 from poettering/journald-watchdog
restore journald watchdog
Diffstat (limited to 'src/basic/def.h')
| -rw-r--r-- | src/basic/def.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index cbef137410..950f693899 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -43,12 +43,6 @@ #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT #define SIGNALS_IGNORE SIGPIPE -#define DIGITS "0123456789" -#define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz" -#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS -#define ALPHANUMERICAL LETTERS DIGITS - #define REBOOT_PARAM_FILE "/run/systemd/reboot-param" #ifdef HAVE_SPLIT_USR @@ -81,3 +75,18 @@ #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" +#else +#define CONF_DIR_SPLIT_USR(n) +#endif |