diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:19:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:19:06 +0200 |
| commit | b8ffbecb7825f36528487d1e5fd67dd28ba6ce1d (patch) | |
| tree | 07d545552480fa5949996f730e3b531b5bdf4243 /runtime | |
| parent | 93662146b46c03b2a5db83ae074aa77f207dd98a (diff) | |
| parent | aa0701b100084d61df6fff10be48bb088f551932 (diff) | |
| download | rsyslog-b8ffbecb7825f36528487d1e5fd67dd28ba6ce1d.tar.gz rsyslog-b8ffbecb7825f36528487d1e5fd67dd28ba6ce1d.tar.xz rsyslog-b8ffbecb7825f36528487d1e5fd67dd28ba6ce1d.zip | |
Merge branch 'v5-devel'
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/msg.c | 2 | ||||
| -rw-r--r-- | runtime/stream.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 1b188263..f575b86b 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2588,7 +2588,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, bFound = 1; } else { dbgprintf("regex found at offset %d, new offset %d, tries %d\n", - iOffs, iOffs + pmatch[0].rm_eo, iTry); + iOffs, (int) (iOffs + pmatch[0].rm_eo), iTry); iOffs += pmatch[0].rm_eo; ++iTry; } diff --git a/runtime/stream.c b/runtime/stream.c index 6b3040d8..260b59ef 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -60,7 +60,14 @@ # include <sys/prctl.h> #endif -#define inline +/* some platforms do not have large file support :( */ +#ifndef O_LARGEFILE +# define O_LARGEFILE 0 +#endif +#ifndef HAVE_LSEEK64 + typedef off_t off64_t; +# define lseek64(fd, offset, whence) lseek(fd, offset, whence) +#endif /* static data */ DEFobjStaticHelpers |