diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-05 09:54:42 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-05 09:54:42 +0100 |
| commit | 40be6cb6e7a167402039d24e047c94bdb19bd22e (patch) | |
| tree | a254249ee29f09c88ee82990d2049ede0ffabb07 /runtime | |
| parent | 424de9fb94725769cfcbb0f0a5937781376c4e73 (diff) | |
| parent | 396e211e5cfd195b7135947d425b089a0447fa88 (diff) | |
| download | rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.tar.gz rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.tar.xz rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.zip | |
Merge branch 'v4-stable-solaris' into master-solaris
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/rt-init.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/atomic.h | 3 | ||||
| -rw-r--r-- | runtime/debug.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/runtime/atomic.h b/runtime/atomic.h index b507b769..9a0d9e22 100644 --- a/runtime/atomic.h +++ b/runtime/atomic.h @@ -67,6 +67,9 @@ # define ATOMIC_DEC_AND_FETCH(data) (--(data)) # define ATOMIC_FETCH_32BIT(data) (data) # define ATOMIC_STORE_1_TO_32BIT(data) (data) = 1 +# define ATOMIC_STORE_1_TO_INT(data) (data) = 1 +# define ATOMIC_STORE_0_TO_INT(data) (data) = 0 +# define ATOMIC_CAS_VAL(data, oldVal, newVal) (data) = (newVal) #endif #endif /* #ifndef INCLUDED_ATOMIC_H */ 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 */ |