diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-10-01 17:56:20 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-10-01 17:56:20 +0400 |
| commit | c046f7bcc92281465917e026f83fd0d38569cb06 (patch) | |
| tree | 711f61cf319e171a5f41c469ef30e3298c8917f8 /plugins/imkmsg/kmsg.c | |
| parent | 17262528e2277c3d069c4a29ed098830d4fdbc08 (diff) | |
| parent | 7ec8c6d6f9114765775ea5100af5b0b20af4502e (diff) | |
| download | rsyslog-c046f7bcc92281465917e026f83fd0d38569cb06.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/collab-maint/rsyslog
Conflicts:
debian/changelog
debian/patches/series
debian/rules
Diffstat (limited to 'plugins/imkmsg/kmsg.c')
| -rw-r--r-- | plugins/imkmsg/kmsg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c index 822d3db..3d9b78e 100644 --- a/plugins/imkmsg/kmsg.c +++ b/plugins/imkmsg/kmsg.c @@ -34,7 +34,8 @@ #include <ctype.h> #include <sys/klog.h> #include <sys/sysinfo.h> -#include <json/json.h> +#include <sys/time.h> +#include <json.h> #include "rsyslog.h" #include "srUtils.h" |