diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 14:21:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 14:21:49 +0100 |
| commit | abef390dae4e959a0650a1f8ff747dc5d1528305 (patch) | |
| tree | 744badfb1d749ad241691781576a122276896dca /tools/omfile.h | |
| parent | ebf058226120b89bc2735ff72c4c12c14cfa2599 (diff) | |
| parent | b4cdb7c997eee95df96321d11d03cf90e4a6caba (diff) | |
| download | rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.gz rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.bz2 rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.zip | |
Merge branch 'beta' into master
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'tools/omfile.h')
| -rw-r--r-- | tools/omfile.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/omfile.h b/tools/omfile.h index 03e081f3..8dca6a88 100644 --- a/tools/omfile.h +++ b/tools/omfile.h @@ -3,7 +3,7 @@ * * File begun on 2007-07-21 by RGerhards (extracted from syslogd.c) * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2010 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -28,7 +28,11 @@ /* prototypes */ rsRetVal modInitFile(int iIFVersRequested __attribute__((unused)), int *ipIFVersProvided, rsRetVal (**pQueryEtryPt)(), rsRetVal (*pHostQueryEtryPt)(uchar*, rsRetVal (**)()), modInfo_t*); +/* the define below is dirty, but we need it for ompipe integration. There is no + * other way to have the functionality (well, one way would be to go through the + * globals, but that seems not yet justified. -- rgerhards, 2010-03-01 + */ +uchar *pszFileDfltTplName; #endif /* #ifndef OMFILE_H_INCLUDED */ -/* - * vi:set ai: +/* vi:set ai: */ |