diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
| commit | 22328c72aef2df73741afefe0e8b53d3ad83f15d (patch) | |
| tree | 4a0b311508ebb28a0dc72e12993f704c2709d46a /runtime/apc.c | |
| parent | da933a7e105acf814d5e7955d39d29eab3a96613 (diff) | |
| parent | 7c0ca7553738161c681c0d0600de99e9fabee81d (diff) | |
| download | rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.bz2 rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
runtime/datetime.c
Diffstat (limited to 'runtime/apc.c')
| -rw-r--r-- | runtime/apc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/apc.c b/runtime/apc.c index 5919191d..bc330e39 100644 --- a/runtime/apc.c +++ b/runtime/apc.c @@ -335,9 +335,11 @@ CancelApc(apc_id_t id) { DEFVARS_mutexProtection_uncond; + BEGINfunc BEGIN_MTX_PROTECTED_OPERATIONS_UNCOND(&listMutex); deleteApc(id); END_MTX_PROTECTED_OPERATIONS_UNCOND(&listMutex); + ENDfunc return RS_RET_OK; } |