diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 15:13:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 15:13:33 +0200 |
| commit | 7e440acbbf5b74ea8e403dfabd1430a4b26fac81 (patch) | |
| tree | 8a2cf4ddddf02bcadbbab118c0ce88255ce82a8b /runtime/stream.c | |
| parent | eae62ad151252c79fcd3350f1a95fa8c9ddbf505 (diff) | |
| parent | 55c2a488c061ec8e9a6973784173c7b1538b2dc5 (diff) | |
| download | rsyslog-7e440acbbf5b74ea8e403dfabd1430a4b26fac81.tar.gz rsyslog-7e440acbbf5b74ea8e403dfabd1430a4b26fac81.tar.bz2 rsyslog-7e440acbbf5b74ea8e403dfabd1430a4b26fac81.zip | |
Merge branch 'v7-stable'
Conflicts:
runtime/stream.c
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 1af5b974..444a33ff 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -1655,7 +1655,7 @@ finalize_it: /* property set methods */ /* simple ones first */ -DEFpropSetMeth(strm, iMaxFileSize, int) +DEFpropSetMeth(strm, iMaxFileSize, int64) DEFpropSetMeth(strm, iFileNumDigits, int) DEFpropSetMeth(strm, tOperationsMode, int) DEFpropSetMeth(strm, tOpenMode, mode_t) |