diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-05-24 13:51:31 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:58 +0200 |
| commit | c733f9b08d9eadc5e671185112567ada81116bdf (patch) | |
| tree | 5755965b950423eae4b3c8f462acaf940a9ad684 /src/basic/log.h | |
| parent | c6edc23d5f8a483e93a891bf7eb76b5f4caf2fb4 (diff) | |
Prep v230: Apply missing upstream fixes and updates (2/8) src/basic.
Diffstat (limited to 'src/basic/log.h')
| -rw-r--r-- | src/basic/log.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/basic/log.h b/src/basic/log.h index 899474daa..0b82b768c 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -35,10 +35,8 @@ typedef enum LogTarget{ LOG_TARGET_CONSOLE, LOG_TARGET_CONSOLE_PREFIXED, LOG_TARGET_KMSG, -#if 0 /// elogind does not support logging to systemd-journald LOG_TARGET_JOURNAL, LOG_TARGET_JOURNAL_OR_KMSG, -#endif // 0 LOG_TARGET_SYSLOG, LOG_TARGET_SYSLOG_OR_KMSG, LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */ @@ -71,10 +69,9 @@ void log_close(void); #if 0 /// UNNEEDED by elogind void log_forget_fds(void); #endif // 0 + void log_close_syslog(void); -#if 0 /// UNNEEDED by elogind void log_close_journal(void); -#endif // 0 void log_close_kmsg(void); void log_close_console(void); @@ -198,13 +195,13 @@ void log_assert_failed_return( #ifdef LOG_TRACE # define log_trace(...) log_debug(__VA_ARGS__) #else -# define log_trace(...) do {} while(0) +# define log_trace(...) do {} while (0) #endif #ifdef ENABLE_DEBUG_ELOGIND # define log_debug_elogind(...) log_debug(__VA_ARGS__);usleep(25*USEC_PER_MSEC) #else -# define log_debug_elogind(...) do {} while(0) +# define log_debug_elogind(...) do {} while (0) #endif // ENABLE_DEBUG_ELOGIND /* Structured logging */ |