diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 09:41:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 09:41:53 +0200 |
| commit | 98a94a68b677074c2061133eb273c3f66d65a8ce (patch) | |
| tree | 20d2c3babee63e08123b6652e6721d9e54754cfa /runtime/debug.c | |
| parent | 2aa16d3b1ea39622dfc35eb3093ac4c4f4997710 (diff) | |
| parent | e1037b5b1fa7e31cc9182085899c65dadcba26da (diff) | |
| download | rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.tar.gz rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.tar.bz2 rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.zip | |
Merge branch 'v6-devel'
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" |