diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
| commit | 9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (patch) | |
| tree | c5f10c015dae3fcfcf52e2bc5985d40cb70fa119 /runtime/queue.h | |
| parent | b941f68aaeec4bd458328e09121b623ac63f6dd6 (diff) | |
| parent | 9f1e195f3d642de85a92199ef9882b820d3fec21 (diff) | |
| download | rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.gz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.xz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/glbl.c
tools/omdiscard.c
Diffstat (limited to 'runtime/queue.h')
| -rw-r--r-- | runtime/queue.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/queue.h b/runtime/queue.h index 38e248cd..97057180 100644 --- a/runtime/queue.h +++ b/runtime/queue.h @@ -124,7 +124,6 @@ struct queue_s { pthread_cond_t notFull, notEmpty; pthread_cond_t belowFullDlyWtrMrk; /* below eFLOWCTL_FULL_DELAY watermark */ pthread_cond_t belowLightDlyWtrMrk; /* below eFLOWCTL_FULL_DELAY watermark */ - pthread_cond_t condDAReady;/* signalled when the DA queue is fully initialized and ready for processing */ int bThrdStateChanged; /* at least one thread state has changed if 1 */ /* end sync variables */ /* the following variables are always present, because they |