diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 14:46:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 14:46:07 +0100 |
| commit | 74a71e798efd58e20cc150b04de2613bf518eed4 (patch) | |
| tree | 5b0b04e1b44912c6a143b180dead5b62e4390343 /runtime/msg.h | |
| parent | a8760241a30dc2618c53c569d23acdec1e06908e (diff) | |
| parent | 5b1cd3330196c5ffa2b8695798946aa2441b7e84 (diff) | |
| download | rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.tar.gz rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.tar.bz2 rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index 1fd95994..01a1e059 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -63,7 +63,8 @@ struct msg { once data has entered the queue, this property is no longer needed. */ pthread_mutex_t mut; int iRefCount; /* reference counter (0 = unused) */ - sbool bDoLock; /* use the mutex? */ + sbool bDoLock; /* use the mutex? */ + sbool bAlreadyFreed; /* aid to help detect a well-hidden bad bug -- TODO: remove when no longer needed */ short iSeverity; /* the severity 0..7 */ short iFacility; /* Facility code 0 .. 23*/ short offAfterPRI; /* offset, at which raw message WITHOUT PRI part starts in pszRawMsg */ |