diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:40:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:40:48 +0200 |
| commit | 3e2be47ed69d2b4ce21777a75ad6128592e84d1d (patch) | |
| tree | 85efb0765fdd3c2143552e14037471422b759d66 /runtime/rsyslog.h | |
| parent | 02929c7bbf1189a4fc96e42fb127f2f04a279719 (diff) | |
| parent | 2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0 (diff) | |
| download | rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.gz rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.xz rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/rsyslog.h
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 032d8c04..a4a8a204 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -258,6 +258,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_FUNC_MISSING_EXPR = -2111, /**< no expression after comma in function call (rainerscript) */ RS_RET_INVLD_NBR_ARGUMENTS = -2112, /**< invalid number of arguments for function call (rainerscript) */ RS_RET_INVLD_FUNC = -2113, /**< invalid function name for function call (rainerscript) */ + RS_RET_NONFATAL_CONFIG_ERR = -2123, /**< non-fatal error during config processing */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |