diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 09:42:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 09:42:32 +0200 |
| commit | 3e4aa167eed33a37163446feb2f28efe3e4582d5 (patch) | |
| tree | b309d9fe6ab1c33f2e9df8512cf0216e2ce86271 /plugins/ommysql/ommysql.c | |
| parent | e2c9493b0d832078e181a6bce3373850df27d204 (diff) | |
| parent | 9f286c0c4c21128c66305166ae379d3f7b07f673 (diff) | |
| download | rsyslog-3e4aa167eed33a37163446feb2f28efe3e4582d5.tar.gz rsyslog-3e4aa167eed33a37163446feb2f28efe3e4582d5.tar.xz rsyslog-3e4aa167eed33a37163446feb2f28efe3e4582d5.zip | |
Merge branch 'master' into udpspoof
Conflicts:
tools/omfwd.c
Diffstat (limited to 'plugins/ommysql/ommysql.c')
| -rw-r--r-- | plugins/ommysql/ommysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c index ecf738a9..d6870a7b 100644 --- a/plugins/ommysql/ommysql.c +++ b/plugins/ommysql/ommysql.c @@ -36,7 +36,7 @@ #include <errno.h> #include <time.h> #include <mysql.h> -#include "dirty.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" |