diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:12:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:12:35 +0200 |
| commit | 651bee9cf55ca6aaea73e7921928bf6f9bd65404 (patch) | |
| tree | 8c3ce1b498e01839fe6ef0c6adb8cfbcb2f42bad /runtime/apc.c | |
| parent | b5f3387357ffa11e238ddfe0fa38af4fffba6081 (diff) | |
| parent | 3abf567d2b57014381eda49018a0e2c21fa1b853 (diff) | |
| download | rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.tar.gz rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.tar.xz rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.zip | |
Merge branch 'omfile' into tmp
This was a complex manual merge, especially in action.c. So if
there occur some problems, this would be a good point to start
troubleshooting. I run a couple of tests before commiting and
they all went well.
Conflicts:
action.c
action.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
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 b0b5f298..1bcaee39 100644 --- a/runtime/apc.c +++ b/runtime/apc.c @@ -332,9 +332,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; } |