diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
| commit | 2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch) | |
| tree | 8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /runtime/rsyslog.h | |
| parent | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff) | |
| parent | 20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff) | |
| download | rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.xz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip | |
Merge branch 'master-newconf'
Conflicts:
ChangeLog
tools/omfile.c
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 0b0dc921..39f00ebc 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -360,6 +360,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_CMD_GONE_AWAY = -2204,/**< config directive existed, but no longer supported */ RS_RET_ERR_SCHED_PARAMS = -2205,/**< there is a problem with configured thread scheduling params */ RS_RET_SOCKNAME_MISSING = -2206,/**< no socket name configured where one is required */ + RS_RET_CONF_PARSE_ERROR = -2207,/**< (fatal) error parsing config file */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |