diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
| commit | 44300ddcb2904105e2ecd56479bf396399dcab26 (patch) | |
| tree | d8a1eef882e4edd784de0a41383d4c43c5b24fd6 /runtime/msg.c | |
| parent | bd157a7d698f420ea3a9459fc90dd930c54a5e54 (diff) | |
| parent | a3c81f500a4d952ce93162a730cadee8fbc8116b (diff) | |
| download | rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.gz rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.bz2 rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/imfile.html
plugins/imfile/imfile.c
runtime/rsyslog.h
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index f575b86b..82565f18 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -851,7 +851,7 @@ CODESTARTobjDestruct(msg) * that we trim too often when the counter wraps. */ static unsigned iTrimCtr = 1; - currCnt = ATOMIC_INC_AND_FETCH(&iTrimCtr, &mutTrimCtr); + currCnt = ATOMIC_INC_AND_FETCH_unsigned(&iTrimCtr, &mutTrimCtr); if(currCnt % 100000 == 0) { malloc_trim(128*1024); } |