From f9bb1ef5425c18c29ca9d7f5a82370518b991f85 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 5 Jul 2012 13:39:00 -0500 Subject: [PATCH] Fix vxWorks build issues from thread-hooks merge. --- src/libCom/osi/os/default/osdThreadExtra.c | 2 +- src/libCom/osi/os/vxWorks/osdThread.c | 2 +- src/libCom/test/epicsThreadHooksTest.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libCom/osi/os/default/osdThreadExtra.c b/src/libCom/osi/os/default/osdThreadExtra.c index d1b5e67ef..549f900ba 100644 --- a/src/libCom/osi/os/default/osdThreadExtra.c +++ b/src/libCom/osi/os/default/osdThreadExtra.c @@ -10,7 +10,7 @@ /* Null default thread hooks for all platforms that do not do anything special */ #define epicsExportSharedSymbols -#include "shareLib.h" +#include "epicsThread.h" epicsShareExtern EPICS_THREAD_HOOK_ROUTINE epicsThreadHookDefault; epicsShareExtern EPICS_THREAD_HOOK_ROUTINE epicsThreadHookMain; diff --git a/src/libCom/osi/os/vxWorks/osdThread.c b/src/libCom/osi/os/vxWorks/osdThread.c index 63a2707c1..9d4bbe6a8 100644 --- a/src/libCom/osi/os/vxWorks/osdThread.c +++ b/src/libCom/osi/os/vxWorks/osdThread.c @@ -107,7 +107,7 @@ static void epicsThreadInit(void) epicsThreadHooksInit(NULL); epicsThreadOnceMutex = semMCreate(SEM_DELETE_SAFE|SEM_INVERSION_SAFE|SEM_Q_PRIORITY); assert(epicsThreadOnceMutex); - epicsThreadListMutex semMCreate(SEM_DELETE_SAFE|SEM_INVERSION_SAFE|SEM_Q_PRIORITY); + epicsThreadListMutex = semMCreate(SEM_DELETE_SAFE|SEM_INVERSION_SAFE|SEM_Q_PRIORITY); assert(epicsThreadListMutex); taskIdList = calloc(ID_LIST_CHUNK, sizeof(int)); assert(taskIdList); diff --git a/src/libCom/test/epicsThreadHooksTest.c b/src/libCom/test/epicsThreadHooksTest.c index d19a6c523..a30d3e011 100644 --- a/src/libCom/test/epicsThreadHooksTest.c +++ b/src/libCom/test/epicsThreadHooksTest.c @@ -8,7 +8,6 @@ /* epicsThreadHooksTest.c */ #include -#include #include "epicsThread.h" #include "epicsExit.h"