diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
| commit | c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (patch) | |
| tree | 107991afae384af32c95be306c86f387ea67083b /runtime | |
| parent | 81c9cf86267fb0ec1156e578439d09499c97e80f (diff) | |
| parent | de7726cbf0957384cc9261ac47d6bf65906739b5 (diff) | |
| download | rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.gz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.xz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.zip | |
Merge branch 'v5-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/property_replacer.html
runtime/datetime.h
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/datetime.h | 5 | ||||
| -rw-r--r-- | runtime/debug.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 9 |
3 files changed, 5 insertions, 11 deletions
diff --git a/runtime/datetime.h b/runtime/datetime.h index 647f3096..82bd415b 100644 --- a/runtime/datetime.h +++ b/runtime/datetime.h @@ -44,12 +44,15 @@ BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ /* v3, 2009-11-12 */ time_t (*GetTime)(time_t *ttSeconds); ENDinterface(datetime) -#define datetimeCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ +#define datetimeCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ /* interface changes: * 1 - initial version * 2 - not compatible to 1 - bugfix required ParseTIMESTAMP3164 to accept char ** as * last parameter. Did not try to remain compatible as this is not something any * third-party module should call. -- rgerhards, 2008.-09-12 + * 3 - taken by v5 branch! + * 4 - formatTimestamp3164 takes a third int parameter + * 5 - merge of versions 3 + 4 (2010-03-09) */ /* prototypes */ diff --git a/runtime/debug.c b/runtime/debug.c index 6d82397f..38857122 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -1,4 +1,3 @@ -#include <sys/syscall.h> /* debug.c * * This file proides debug and run time error analysis support. Some of the @@ -553,6 +552,7 @@ if(pLog == NULL) { return; /* if we don't know it yet, we can not clean up... */ } #endif +#include <sys/syscall.h> /* we found the last lock entry. We now need to see from which FuncDB we need to * remove it. This is recorded inside the mutex log entry. diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index a75d2bc0..4cb20163 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -57,15 +57,6 @@ * # End Config Settings # * * ############################################################# */ -#ifndef NOLARGEFILE -# undef _LARGEFILE_SOURCE -# undef _LARGEFILE64_SOURCE -# undef _FILE_OFFSET_BITS -# define _LARGEFILE_SOURCE -# define _LARGEFILE64_SOURCE -# define _FILE_OFFSET_BITS 64 -#endif - /* portability: not all platforms have these defines, so we * define them here if they are missing. -- rgerhards, 2008-03-04 */ |