diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 12:15:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 12:15:08 +0100 |
| commit | dbd16e0a2967ebe88b3f69bfaa02e3532dd59112 (patch) | |
| tree | 2610e57bac16a93198c7b7f746c8af80b185e247 /runtime/wtp.c | |
| parent | bdf743197da2e09f303cbd06c708767fe7c6adfd (diff) | |
| parent | 8314c3f01634c4726e7070ae799bbf7edc4dbb88 (diff) | |
| download | rsyslog-dbd16e0a2967ebe88b3f69bfaa02e3532dd59112.tar.gz rsyslog-dbd16e0a2967ebe88b3f69bfaa02e3532dd59112.tar.bz2 rsyslog-dbd16e0a2967ebe88b3f69bfaa02e3532dd59112.zip | |
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index f8d3588b..19151e7c 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -381,9 +381,9 @@ wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in if(prctl(PR_SET_NAME, thrdName, 0, 0, 0) != 0) { DBGPRINTF("prctl failed, not setting thread name for '%s'\n", wtpGetDbgHdr(pThis)); } + dbgOutputTID((char*)thrdName); # endif - dbgOutputTID((char*)thrdName); pthread_cleanup_push(wtpWrkrExecCancelCleanup, pWti); wtiWorker(pWti); pthread_cleanup_pop(0); |