diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:42 +0200 |
| commit | d5585524b7c749c1bbecf1e68b06269be82583e2 (patch) | |
| tree | 221ec5ef9f07ceef07c7d6ec0af5675d5edf56a6 /runtime/obj.c | |
| parent | 4224ee66376f1a8e914e63f402c71de29180e21c (diff) | |
| parent | 27360bb33ff5e87a3852ebe2673170ebea168421 (diff) | |
| download | rsyslog-d5585524b7c749c1bbecf1e68b06269be82583e2.tar.gz rsyslog-d5585524b7c749c1bbecf1e68b06269be82583e2.tar.bz2 rsyslog-d5585524b7c749c1bbecf1e68b06269be82583e2.zip | |
Merge branch 'beta'
Diffstat (limited to 'runtime/obj.c')
| -rw-r--r-- | runtime/obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index 93fbd281..b2739c58 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -96,7 +96,7 @@ DEFobjCurrIf(module) DEFobjCurrIf(errmsg) DEFobjCurrIf(strm) static objInfo_t *arrObjInfo[OBJ_NUM_IDS]; /* array with object information pointers */ -static pthread_mutex_t mutObjGlobalOp; /* mutex to guard global operations of the object system */ +pthread_mutex_t mutObjGlobalOp; /* mutex to guard global operations of the object system */ /* cookies for serialized lines */ @@ -1318,7 +1318,7 @@ objClassInit(modInfo_t *pModInfo) } /* the mutex must be recursive, because objects may call into other - * object identifieres recursively. + * object identifiers recursively. */ pthread_mutexattr_init(&mutAttr); pthread_mutexattr_settype(&mutAttr, PTHREAD_MUTEX_RECURSIVE); |