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

fix for vxWorks 6.9.0

Browse Source
This commit is contained in:
zimoch
2021-03-02 17:28:55 +01:00
parent 505e6f45c1
commit 0dae3e206f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,18 @@
/* VxWorks 6.9 and later can support joining threads */
#if (!defined(_WRS_VXWORKS_MAJOR) || _WRS_VXWORKS_MAJOR == 6 && _WRS_VXWORKS_MINOR < 9)
#undef EPICS_THREAD_CAN_JOIN
#include <epicsVersion.h>
#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
#if VXWORKS_VERSION_INT < VERSION_INT(6, 9, 4, 1)
# undef EPICS_THREAD_CAN_JOIN
#endif
#endif /* osdThreadh */