diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
| commit | ed36822e37b3328dc52c70f96c0a099f224edc1a (patch) | |
| tree | d271ea51301cac4daddaa482a4f9ff6e27b145df /runtime | |
| parent | 0972943f5265dca1f56dcb25bd361d40040bef87 (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.gz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.xz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
configure.ac
runtime/cfsysline.c
tools/ompipe.c
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 |