epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Support VxWorks 6.9.x before taskWait() was added

Browse Source 
We don't know exactly which version this was added in,
but it is present in 6.9.4.1 so use that.

Fixes lp: #1913699
This commit is contained in:
Andrew Johnson
2021-03-02 11:54:17 -06:00
parent 3c46542630
commit f9e3e86401
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/libcom/src/osi/os/vxWorks/osdThread.h
View File

@@ -1,5 +1,5 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2021 The University of Chicago, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
@@ -8,13 +8,22 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
#ifndef osdThreadh
#define osdThreadh
#ifndef INC_osdThread_H
#define INC_osdThread_H
/* VxWorks 6.9 and later can support joining threads */
#include <epicsVersion.h>
#if (_WRS_VXWORKS_MAJOR == 6 && _WRS_VXWORKS_MINOR < 9)
#undef EPICS_THREAD_CAN_JOIN
#ifdef _WRS_VXWORKS_MAJOR
# define VXWORKS_VERSION_INT VERSION_INT(_WRS_VXWORKS_MAJOR, \
_WRS_VXWORKS_MINOR, _WRS_VXWORKS_MAINT, _WRS_VXWORKS_SVCPK)
#else
/* Version not available at compile-time, assume... */
# define VXWORKS_VERSION_INT VERSION_INT(5, 5, 0, 0)
#endif
#endif /* osdThreadh */
#if VXWORKS_VERSION_INT < VERSION_INT(6, 9, 4, 1)
/* VxWorks 6.9.4.1 and later can support joining threads */
# undef EPICS_THREAD_CAN_JOIN
#endif
#endif /* INC_osdThread_H */