diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 10:18:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 10:18:28 +0200 |
| commit | b184158a6e54f15a048c1d1bcd27da4463e696a8 (patch) | |
| tree | cb5c85ea3c98cba86699112ed9a44c0582796631 /runtime/debug.c | |
| parent | 398704183200adea592bf17059b3c443160efcf6 (diff) | |
| parent | 156382746626459aaf64d79eac95183d1ab60680 (diff) | |
| download | rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.tar.gz rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.tar.bz2 rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.zip | |
Merge branch 'master' into master-newtemplate
Conflicts:
template.c
Diffstat (limited to 'runtime/debug.c')
| -rw-r--r-- | runtime/debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index edc4a255..307a8bb8 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -927,12 +927,12 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg) pszObjName = obj.GetName(pObj); } -// pthread_mutex_lock(&mutdbgprint); -// pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint); + pthread_mutex_lock(&mutdbgprint); + pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint); do_dbgprint(pszObjName, pszMsg, lenMsg); -// pthread_cleanup_pop(1); + pthread_cleanup_pop(1); } #pragma GCC diagnostic warning "-Wempty-body" |