diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-30 13:52:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-30 13:52:49 +0100 |
| commit | b54797da054a74144f10dfeb0daeca99decd9b12 (patch) | |
| tree | 99b173ac46ff792d7401d60a0e78846e4b4eda18 /runtime/msg.h | |
| parent | 2cfaf5f86a4fb40cc37ae71118c506f1d924df13 (diff) | |
| parent | a2bfabc1c0cb1afd02d53ae731779486b566ddb6 (diff) | |
| download | rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.gz rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.bz2 rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.zip | |
Merge branch 'v3-stable' into beta, conclude fix for race
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index 21cb2c64..1bad9c66 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -51,6 +51,7 @@ struct msg { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ pthread_mutexattr_t mutAttr; +short bDoLock; /* use the mutex? */ pthread_mutex_t mut; int iRefCount; /* reference counter (0 = unused) */ short bParseHOSTNAME; /* should the hostname be parsed from the message? */ |