diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
| commit | e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124 (patch) | |
| tree | 2783ebe1f2983311c0b85d738e093da9a2d02aff /runtime/msg.h | |
| parent | de2fd07836accab563ecbf0405749b6bef9e76b4 (diff) | |
| parent | b151584d0929759284c0fb0399709e5ca0e29d60 (diff) | |
| download | rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.gz rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.bz2 rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index 396e861f..172ae0da 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -173,7 +173,7 @@ void MsgSetRawMsg(msg_t *pMsg, char* pszRawMsg, size_t lenMsg); rsRetVal MsgReplaceMSG(msg_t *pThis, uchar* pszMSG, int lenMSG); uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, propid_t propid, es_str_t *propName, - rs_size_t *pPropLen, unsigned short *pbMustBeFreed); + rs_size_t *pPropLen, unsigned short *pbMustBeFreed, struct syslogTime *ttNow); char *textpri(char *pRes, size_t pResLen, int pri); rsRetVal msgGetMsgVar(msg_t *pThis, cstr_t *pstrPropName, var_t **ppVar); es_str_t* msgGetMsgVarNew(msg_t *pThis, uchar *name); |