diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:37:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:37:52 +0200 |
| commit | a4e5c7d4cca1c4fe42f5690dcd17195864c59f97 (patch) | |
| tree | 11cabf23c78b865b02e5f7f75e75d65769c4d1f6 /runtime/obj.c | |
| parent | 1bf76e99d61f7b62a6c7c52514ef7de0f1aebf81 (diff) | |
| parent | 90e8475260cf8ac54519b3d964d879489af879f6 (diff) | |
| download | rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.tar.gz rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.tar.bz2 rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.zip | |
Merge branch 'newqueue'
Conflicts:
ChangeLog
runtime/queue.c
Diffstat (limited to 'runtime/obj.c')
| -rw-r--r-- | runtime/obj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index aebea332..3692b957 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -1129,7 +1129,7 @@ UseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) /* DEV debug only: dbgprintf("source file %s requests object '%s', ifIsLoaded %d\n", srcFile, pObjName, pIf->ifIsLoaded); */ - d_pthread_mutex_lock(&mutObjGlobalOp); + pthread_mutex_lock(&mutObjGlobalOp); if(pIf->ifIsLoaded == 1) { ABORT_FINALIZE(RS_RET_OK); /* we are already set */ @@ -1170,7 +1170,7 @@ UseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) pIf->ifIsLoaded = 1; /* we are happy */ finalize_it: - d_pthread_mutex_unlock(&mutObjGlobalOp); + pthread_mutex_unlock(&mutObjGlobalOp); if(pStr != NULL) rsCStrDestruct(&pStr); @@ -1193,7 +1193,7 @@ ReleaseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) /* dev debug only dbgprintf("source file %s releasing object '%s', ifIsLoaded %d\n", srcFile, pObjName, pIf->ifIsLoaded); */ - d_pthread_mutex_lock(&mutObjGlobalOp); + pthread_mutex_lock(&mutObjGlobalOp); if(pObjFile == NULL) FINALIZE; /* if it is not a lodable module, we do not need to do anything... */ @@ -1214,7 +1214,7 @@ ReleaseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) pIf->ifIsLoaded = 0; /* indicated "no longer valid" */ finalize_it: - d_pthread_mutex_unlock(&mutObjGlobalOp); + pthread_mutex_unlock(&mutObjGlobalOp); if(pStr != NULL) rsCStrDestruct(&pStr); |