Bring back VxWorks 5 compatibility

This commit is contained in:
2020-04-07 15:37:32 +02:00
parent bbaa207603
commit ab97b5fe54
3 changed files with 17 additions and 4 deletions

View File

@@ -24,7 +24,11 @@
# error compiler/gcc/compilerSpecific.h is not for use with the clang compiler
#endif
#define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
#if __GNUC__ > 2
# define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
#else
# define EPICS_ALWAYS_INLINE __inline__
#endif
/* Expands to a 'const char*' which describes the name of the current function scope */
#define EPICS_FUNCTION __PRETTY_FUNCTION__
@@ -41,7 +45,9 @@
/*
* CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
*/
#define CXX_PLACEMENT_DELETE
#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 96 )
# define CXX_PLACEMENT_DELETE
#endif
#endif /* __cplusplus */
@@ -53,7 +59,9 @@
/*
* Deprecation marker
*/
#define EPICS_DEPRECATED __attribute__((deprecated))
#if (__GNUC__ > 2)
# define EPICS_DEPRECATED __attribute__((deprecated))
#endif
/*
* Unused marker

View File

@@ -46,9 +46,14 @@
static SPARE_NUM joinField;
#define ALLOT_JOIN(tid) taskSpareNumAllot(tid, &joinField)
#else
#include <private/taskLibP.h>
#define ALLOT_JOIN(tid)
#endif
#ifndef _WRS_VXWORKS_MAJOR
/* vxWorks 5 */
#define taskCreate taskCreat
#endif
epicsShareFunc void osdThreadHooksRun(epicsThreadId id);

View File

@@ -12,7 +12,7 @@
/* VxWorks 6.9 and later can support joining threads */
#if (_WRS_VXWORKS_MAJOR == 6 && _WRS_VXWORKS_MINOR < 9)
#if (!defined(_WRS_VXWORKS_MAJOR) || _WRS_VXWORKS_MAJOR == 6 && _WRS_VXWORKS_MINOR < 9)
#undef EPICS_THREAD_CAN_JOIN
#endif