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/macro.h | |
| parent | 5703176d6e9680c32caac1de2d6bdb84cdc72c96 (diff) | |
| parent | 119e9655dc36f18ed74f9a256d5c693b5aeb43ab (diff) | |
Merge pull request #1767 from poettering/journald-watchdog
restore journald watchdog
Diffstat (limited to 'src/basic/macro.h')
| -rw-r--r-- | src/basic/macro.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h index daa7c416f7..5088e6720d 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -334,21 +334,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { _found; \ }) -/* 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 - /* Define C11 thread_local attribute even on older gcc compiler * version */ #ifndef thread_local |