diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:41:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:41:23 +0200 |
| commit | 163acd9d9fd5e01975e99ad26af8a9c8097b3260 (patch) | |
| tree | d5901dfca0f2e38ddcf8b973086343ab23a866a1 /runtime/debug.c | |
| parent | bee73d2d93105b187171a1cc51ecf4125b39b65d (diff) | |
| parent | 82d0b37dc86385cd239b03da1e57eaba88720589 (diff) | |
| download | rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.tar.gz rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.tar.bz2 rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.zip | |
Merge branch 'v6-beta' into v6-stable
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" |