summaryrefslogtreecommitdiffstats
path: root/plugins/omlibdbi/omlibdbi.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-20 11:48:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-20 11:48:17 +0200
commitac32d356b5b776e0ca549d5c689a8932af4c2171 (patch)
treed8aa8631ec9b7aae850801be4076d71a652e483e /plugins/omlibdbi/omlibdbi.c
parentfd4a54698cee48da073622f7d6ac49c94ccb1808 (diff)
parent1d86889922cb9232819b4451afce091e8a0ad938 (diff)
downloadrsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.gz
rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.bz2
rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.zip
Merge branch 'v5-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
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 2142878c..c0bfed61 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"