diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:16:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:16:25 +0200 |
| commit | 2a4e1c12f235d6914d650dd29d56df152b014209 (patch) | |
| tree | 3c9f7208c33deb589b2c329a9d9cb68d674680ae /runtime/msg.h | |
| parent | 1f3d7e3a9d71d0c494db0de42709a700b34d786d (diff) | |
| parent | 2514bccdccaebe128055ffa0dc5132b4f4c48635 (diff) | |
| download | rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.tar.gz rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.tar.bz2 rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.zip | |
Merge branch 'master' into v7-devel
Conflicts:
runtime/msg.c
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 0cad1166..6c907692 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -124,6 +124,7 @@ struct msg { char pszRcvdAt_SecFrac[7]; /* same as above. Both are fractional seconds for their respective timestamp */ char pszTIMESTAMP_Unix[12]; /* almost as small as a pointer! */ char pszRcvdAt_Unix[12]; + uchar *pszUUID; /* The message's UUID */ }; @@ -186,7 +187,6 @@ rsRetVal msgGetCEEVar(msg_t *pThis, cstr_t *propName, var_t **ppVar); es_str_t* msgGetCEEVarNew(msg_t *pMsg, char *name); rsRetVal msgAddJSON(msg_t *pM, uchar *name, struct json_object *json); - /* TODO: remove these five (so far used in action.c) */ uchar *getMSG(msg_t *pM); char *getHOSTNAME(msg_t *pM); |