diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-01 12:22:36 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-01 12:22:36 +0100 |
commit | 7974621502ae249a5e393dafb4f69895851b4014 (patch) | |
tree | 762a57f0f6e25d85dc1c8af2e2f553f1060b70e3 /runtime/stream.h | |
parent | d2b7a55b04b24bff278953240754cc688a32f6b8 (diff) | |
parent | a1f4330a7b1ab426d7abeeacb4ff4e5994c429e6 (diff) | |
download | rsyslog-7974621502ae249a5e393dafb4f69895851b4014.tar.gz rsyslog-7974621502ae249a5e393dafb4f69895851b4014.tar.xz rsyslog-7974621502ae249a5e393dafb4f69895851b4014.zip |
Merge branch 'v5-devel'
Conflicts:
plugins/imfile/imfile.c
plugins/imudp/imudp.c
plugins/ommysql/ommysql.c
Diffstat (limited to 'runtime/stream.h')
-rw-r--r-- | runtime/stream.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/stream.h b/runtime/stream.h index 37e9d570..60c68cb2 100644 --- a/runtime/stream.h +++ b/runtime/stream.h @@ -156,7 +156,6 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */ rsRetVal (*SetFileName)(strm_t *pThis, uchar *pszName, size_t iLenName); rsRetVal (*ReadChar)(strm_t *pThis, uchar *pC); rsRetVal (*UnreadChar)(strm_t *pThis, uchar c); - rsRetVal (*ReadLine)(strm_t *pThis, cstr_t **ppCStr); rsRetVal (*SeekCurrOffs)(strm_t *pThis); rsRetVal (*Write)(strm_t *pThis, uchar *pBuf, size_t lenBuf); rsRetVal (*WriteChar)(strm_t *pThis, uchar c); @@ -183,8 +182,10 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */ INTERFACEpropSetMeth(strm, iSizeLimit, off_t); INTERFACEpropSetMeth(strm, iFlushInterval, int); INTERFACEpropSetMeth(strm, pszSizeLimitCmd, uchar*); + /* v6 added */ + rsRetVal (*ReadLine)(strm_t *pThis, cstr_t **ppCStr, int mode); ENDinterface(strm) -#define strmCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ +#define strmCURR_IF_VERSION 6 /* increment whenever you change the interface structure! */ /* prototypes */ |