From f24dafa1e0232955ec05ac32c34041cbe30b6906 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 1 Apr 2014 11:09:36 -0500 Subject: [PATCH] libCom: Adjust the Posix epicsMutexOSD structure Make pthread_mutex_t lock the first member of the parent structure, so it's easy to convert between them. --- src/libCom/osi/os/posix/osdMutex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libCom/osi/os/posix/osdMutex.c b/src/libCom/osi/os/posix/osdMutex.c index 68235ab3f..7ad6c56ef 100644 --- a/src/libCom/osi/os/posix/osdMutex.c +++ b/src/libCom/osi/os/posix/osdMutex.c @@ -64,8 +64,8 @@ static int mutexLock(pthread_mutex_t *id) #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE)>=500 typedef struct epicsMutexOSD { - pthread_mutexattr_t mutexAttr; pthread_mutex_t lock; + pthread_mutexattr_t mutexAttr; } epicsMutexOSD; epicsMutexOSD * epicsMutexOsdCreate(void) { @@ -158,8 +158,8 @@ void epicsMutexOsdShow(struct epicsMutexOSD * pmutex, unsigned int level) #else /*defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE)>=500 */ typedef struct epicsMutexOSD { - pthread_mutexattr_t mutexAttr; pthread_mutex_t lock; + pthread_mutexattr_t mutexAttr; pthread_cond_t waitToBeOwner; #if defined _POSIX_THREAD_PROCESS_SHARED pthread_condattr_t condAttr;