diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-08 14:27:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-08 14:27:20 +0100 |
| commit | 06387e5592ffb4f7b20ea631f0824ff2cc652c20 (patch) | |
| tree | dc964b62013bf67dc18c73d3fc1f3a97e931fed0 /runtime | |
| parent | b4cdb7c997eee95df96321d11d03cf90e4a6caba (diff) | |
| parent | 0b84d47f7a244c25f63fadcec92d12ebfbe319a4 (diff) | |
| download | rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.gz rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.bz2 rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.zip | |
Merge branch 'v4-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/rt-init.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/debug.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 545ac876..41dd1370 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 @@ -550,6 +549,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 e5e89b1f..1a9186ed 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 */ |