diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
commit | 060ea06c41012a00db17cfbd2cff5b2eade3eb51 (patch) | |
tree | d7759af829587dbd1a4b1de9745c5b3db0053bd7 /plugins/imklog/imklog.h | |
parent | 285444aa313454b09ad0cac1e29f326cd4373096 (diff) | |
parent | c574f90c450ece3e336612e232e464b7c8d08ab1 (diff) | |
download | rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.gz rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.bz2 rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.zip |
Merge branch 'beta'
Conflicts:
syslogd.c
Diffstat (limited to 'plugins/imklog/imklog.h')
-rw-r--r-- | plugins/imklog/imklog.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 2db75009..71525a79 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -42,6 +42,5 @@ extern void vsyslog(int pri, const char *fmt, va_list ap); rsRetVal Syslog(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); #endif /* #ifndef IMKLOG_H_INCLUDED */ -/* - * vi:set ai: +/* vi:set ai: */ |