diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
commit | a77a99bfbf8505d05b08a981ab25d599af864ce5 (patch) | |
tree | 2445512303106459f455d359114c71c46ef87353 /runtime | |
parent | d3fe3b28aca6ffd616f55929af9f459585739a06 (diff) | |
parent | 32e715929f5d946d7244db3bc0595842dd293dd9 (diff) | |
download | rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.gz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.xz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.zip |
Merge branch 'v4-devel' into master
Conflicts:
Makefile.am
tests/tcpflood.c
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/rsyslog.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 81b446e3..34eaedca 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -450,6 +450,10 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_TIMEOUT = -2164, /**< timeout occured during operation */ RS_RET_RCV_ERR = -2165, /**< error occured during socket rcv operation */ RS_RET_NO_SOCK_CONFIGURED = -2166, /**< no socket (name) was configured where one is required */ + RS_RET_NO_LSTN_DEFINED = -2172, /**< no listener defined (e.g. inside an input module) */ + RS_RET_EPOLL_CR_FAILED = -2173, /**< epoll_create() failed */ + RS_RET_EPOLL_CTL_FAILED = -2174, /**< epoll_ctl() failed */ + RS_RET_INTERNAL_ERROR = -2175, /**< rsyslogd internal error, unexpected code path reached */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |