diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
| commit | ec339c909734759e957065d00848abfcdfdfaf8f (patch) | |
| tree | 6c04178f35c7990af56fb74194b491ce91c51e47 /runtime | |
| parent | 9d98af3407423e723c114f009bd0915099580b6e (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.gz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.xz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
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 57291def..10c5f82a 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2493,7 +2493,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 815176a2..ce1f5ec2 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 |