Compilation fix on OSX / Windows

This commit is contained in:
Bertrand Songis
2019-06-21 12:51:39 +02:00
parent 2ac0ed307d
commit ba445c6c0d
4 changed files with 19 additions and 14 deletions
+11 -5
View File
@@ -28,7 +28,6 @@ extern "C++" {
#endif
#if defined(SIMU)
#include <pthread.h>
#include <semaphore.h>
@@ -113,11 +112,20 @@ extern "C++" {
#define TASK_FUNCTION(task) void * task(void * pdata)
template<int SIZE>
inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name, FakeTaskStack<SIZE> &, unsigned, unsigned)
inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name)
{
pthread_create(&taskId, nullptr, task, nullptr);
#ifdef __linux__
pthread_setname_np(taskId, name);
#endif
}
template<int SIZE>
inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name, FakeTaskStack<SIZE> &, unsigned size = 0, unsigned priority = 0)
{
UNUSED(size);
UNUSED(priority);
RTOS_CREATE_TASK(taskId, task, name);
}
#define TASK_RETURN() return nullptr
@@ -138,9 +146,7 @@ extern "C++" {
{
return (uint32_t)(simuTimerMicros() / 1000);
}
#elif defined(RTOS_COOS)
#ifdef __cplusplus
extern "C" {
#endif