summaryrefslogtreecommitdiffstats
path: root/plugins/omlibdbi/omlibdbi.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-06 09:17:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-06 09:17:27 +0200
commitee403c2ad745039add6cd34ec1e9a55aa9d51160 (patch)
tree0d5a6f5463d91a7fa160532e2f3e094590ff4506 /plugins/omlibdbi/omlibdbi.c
parent06633d3fac69a3d380b36ce728a6f2278561b4bb (diff)
parentffdc33e3f178ad85ba5c2c9f7fcee98b743e9d5e (diff)
downloadrsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.gz
rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.bz2
rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.zip
Merge branch 'v5-stable-imfile-batches' into v5-devel
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'plugins/omlibdbi/omlibdbi.c')
-rw-r--r--plugins/omlibdbi/omlibdbi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c
index 7fcf9631..e6f3fbd9 100644
--- a/plugins/omlibdbi/omlibdbi.c
+++ b/plugins/omlibdbi/omlibdbi.c
@@ -43,6 +43,7 @@
#include "dirty.h"
#include "syslogd-types.h"
#include "cfsysline.h"
+#include "conf.h"
#include "srUtils.h"
#include "template.h"
#include "module-template.h"