diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
| commit | 27360bb33ff5e87a3852ebe2673170ebea168421 (patch) | |
| tree | 4b172b4c41a32ee2baa1baceb2b23339ace077f9 /runtime/obj.c | |
| parent | f8ab9d166648f2b3af11bc3523e192bb3cd79219 (diff) | |
| parent | 29cd813960ed8e4f800cb9210d30888368587f1c (diff) | |
| download | rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.gz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.xz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.zip | |
Merge branch 'v5-beta' into beta
Conflicts:
runtime/modules.c
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); |