diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
commit | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch) | |
tree | 43a91ec3d4c7306c9ddda820b916e8da71b3d065 /runtime/wti.c | |
parent | 2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff) | |
parent | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff) | |
download | rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.xz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
Diffstat (limited to 'runtime/wti.c')
-rw-r--r-- | runtime/wti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/wti.c b/runtime/wti.c index 382f3668..f91fb5a9 100644 --- a/runtime/wti.c +++ b/runtime/wti.c @@ -86,7 +86,7 @@ rsRetVal wtiSetAlwaysRunning(wti_t *pThis) { ISOBJ_TYPE_assert(pThis, wti); - pThis->bAlwaysRunning = TRUE; + pThis->bAlwaysRunning = RSTRUE; return RS_RET_OK; } @@ -198,7 +198,7 @@ wtiConstructFinalize(wti_t *pThis) DBGPRINTF("%s: finalizing construction of worker instance data\n", wtiGetDbgHdr(pThis)); /* initialize our thread instance descriptor (no concurrency here) */ - pThis->bIsRunning = FALSE; + pThis->bIsRunning = RSFALSE; /* we now alloc the array for user pointers. We obtain the max from the queue itself. */ CHKiRet(pThis->pWtp->pfGetDeqBatchSize(pThis->pWtp->pUsr, &iDeqBatchSize)); |