diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
commit | 44300ddcb2904105e2ecd56479bf396399dcab26 (patch) | |
tree | d8a1eef882e4edd784de0a41383d4c43c5b24fd6 /plugins/imfile | |
parent | bd157a7d698f420ea3a9459fc90dd930c54a5e54 (diff) | |
parent | a3c81f500a4d952ce93162a730cadee8fbc8116b (diff) | |
download | rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.gz rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.xz rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.zip |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/imfile.html
plugins/imfile/imfile.c
runtime/rsyslog.h
Diffstat (limited to 'plugins/imfile')
-rw-r--r-- | plugins/imfile/imfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index a1e304e5..8681ac8c 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -47,6 +47,7 @@ #include "datetime.h" #include "unicode-helper.h" #include "prop.h" +#include "stringbuf.h" MODULE_TYPE_INPUT /* must be present for input modules, do not remove */ |