diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
commit | 4a5a3196fbe4e5a4e9f8dea49f916462adbf3098 (patch) | |
tree | df7750c93603d4a979188f3385c9fe4997072c7f /runtime/debug.c | |
parent | 9cf1756dc6c06682b32ed7a789ceb4254b5792df (diff) | |
parent | cbe2e3d44496ec7c6418e7e74ce917f2086a2947 (diff) | |
download | rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.gz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.xz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.zip |
Merge branch 'v4-devel' into master
Conflicts:
runtime/Makefile.am
runtime/atomic.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
runtime/wtp.c
runtime/wtp.h
Diffstat (limited to 'runtime/debug.c')
-rw-r--r-- | runtime/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 899d05da..64e251e5 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -1093,7 +1093,7 @@ int dbgEntrFunc(dbgFuncDB_t **ppFuncDB, const char *file, const char *func, int } /* when we reach this point, we have a fully-initialized FuncDB! */ - ATOMIC_INC(pFuncDB->nTimesCalled); + PREFER_ATOMIC_INC(pFuncDB->nTimesCalled); if(bLogFuncFlow && dbgPrintNameIsInList((const uchar*)pFuncDB->file, printNameFileRoot)) if(strcmp(pFuncDB->file, "stringbuf.c")) { /* TODO: make configurable */ dbgprintf("%s:%d: %s: enter\n", pFuncDB->file, pFuncDB->line, pFuncDB->func); |