diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 17:50:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 17:50:45 +0100 |
| commit | cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15 (patch) | |
| tree | 266589cc5a59d31f3b18a05b79bcb3d9bec22a55 /runtime/queue.h | |
| parent | f6434d87c4c38edb80a718a5e0929ac369e8bfba (diff) | |
| parent | d94ba2a5468089b657e0779ddd2f4585face37e3 (diff) | |
| download | rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.tar.gz rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.tar.bz2 rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.zip | |
Merge branch 'v6-stable'
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h
Diffstat (limited to 'runtime/queue.h')
| -rw-r--r-- | runtime/queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/queue.h b/runtime/queue.h index 2432c13f..c9fdd94c 100644 --- a/runtime/queue.h +++ b/runtime/queue.h @@ -171,7 +171,7 @@ struct queue_s { STATSCOUNTER_DEF(ctrFull, mutCtrFull); STATSCOUNTER_DEF(ctrFDscrd, mutCtrFDscrd); STATSCOUNTER_DEF(ctrNFDscrd, mutCtrNFDscrd); - int ctrMaxqsize; + int ctrMaxqsize; /* NOT guarded by a mutex */ }; |