diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
| commit | ba31ca0c288c71a714a93118acfb214879bf7b8f (patch) | |
| tree | 670c914437ba781f34d6ab37962cb337711f7f26 /runtime/obj.c | |
| parent | 050db3854d664b47b8b27d7877984500c8ba9568 (diff) | |
| parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
| download | rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.gz rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.bz2 rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 29ca8117..f9afecd8 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -97,7 +97,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 */ @@ -1319,7 +1319,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); |