diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-23 14:51:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-23 14:51:34 +0200 |
commit | 2eea95f626badb5a93ff7eca97cc68e5d2f3940a (patch) | |
tree | c7467c2ace398cda5d39e0f6fbda07e38fdc8e5c /runtime/queue.h | |
parent | 7d8ac48a4a214da917f7455f24b4c292c3e6d015 (diff) | |
parent | 9b06a4c26422b0a8727e1b3c6cc7141226186105 (diff) | |
download | rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.tar.gz rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.tar.bz2 rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.zip |
Merge branch 'master' into master-elasticsearch
Conflicts:
plugins/omelasticsearch/omelasticsearch.c
Diffstat (limited to 'runtime/queue.h')
-rw-r--r-- | runtime/queue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/queue.h b/runtime/queue.h index c9fdd94c..3841615a 100644 --- a/runtime/queue.h +++ b/runtime/queue.h @@ -205,6 +205,7 @@ PROTOTYPEpropSetMeth(qqueue, toQShutdown, long); PROTOTYPEpropSetMeth(qqueue, toActShutdown, long); PROTOTYPEpropSetMeth(qqueue, toWrkShutdown, long); PROTOTYPEpropSetMeth(qqueue, toEnq, long); +PROTOTYPEpropSetMeth(qqueue, iLightDlyMrk, int); PROTOTYPEpropSetMeth(qqueue, iHighWtrMrk, int); PROTOTYPEpropSetMeth(qqueue, iLowWtrMrk, int); PROTOTYPEpropSetMeth(qqueue, iDiscardMrk, int); |