diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:52:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:52:06 +0200 |
| commit | 8eb10a7105dce1dc3ffc44b291de73d82bd04799 (patch) | |
| tree | e3c70740599127009b6009a2846d8274e67c8900 /tools/omshell.c | |
| parent | 675d46f5b59f64e378968baa5e0dec6810090287 (diff) | |
| parent | c53ca3a23429e750aeb6ab1c3600ae8ecb3c8ac6 (diff) | |
| download | rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.tar.gz rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.tar.xz rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.zip | |
Merge branch 'omfile'
Conflicts:
ChangeLog
Diffstat (limited to 'tools/omshell.c')
| -rw-r--r-- | tools/omshell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/omshell.c b/tools/omshell.c index 7b815869..f8a68527 100644 --- a/tools/omshell.c +++ b/tools/omshell.c @@ -38,7 +38,7 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include "syslogd.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "omshell.h" |