diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
| commit | c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6 (patch) | |
| tree | 48d9110b63e34c59c1648df3ff8a7049327bc487 /runtime/msg.c | |
| parent | 236c96ffb124074d6efe3382b4d1b77da9a2986a (diff) | |
| parent | 3a12d05433153d5c7c84f85af6b5039fbcdd1d09 (diff) | |
| download | rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.gz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.xz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.zip | |
Merge branch 'v4-devel' into master
Conflicts:
runtime/rsyslog.h
runtime/wtp.c
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 215189ce..5885cada 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3141,7 +3141,7 @@ static rsRetVal msgConstructFinalizer(msg_t *pThis) * rgerhards, 2008-01-14 */ static rsRetVal -MsgGetSeverity(obj_t *pThis, int *piSeverity) +MsgGetSeverity(obj_t_ptr pThis, int *piSeverity) { ISOBJ_TYPE_assert(pThis, msg); assert(piSeverity != NULL); |