sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS fix

This commit is contained in:
Jérôme Leclercq 2022-03-19 23:45:26 +01:00
parent 04dfd25c74
commit 54ca483cc7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Core/Posix/FileImpl.hpp
View File

@ -16,7 +16,7 @@
#include <ctime> #include <ctime>
#include <filesystem> #include <filesystem>
#if defined(NAZARA_PLATFORM_MACOSX) #if defined(NAZARA_PLATFORM_MACOS)
#define Stat stat #define Stat stat
#define Fstat fstat #define Fstat fstat
#define Off_t off_t #define Off_t off_t

4
src/Nazara/Core/Posix/TaskSchedulerImpl.cpp
View File

@ -6,7 +6,7 @@
#include <Nazara/Core/Functor.hpp> #include <Nazara/Core/Functor.hpp>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>
#if defined(NAZARA_PLATFORM_MACOSX) #if defined(NAZARA_PLATFORM_MACOS)
#include <errno.h> #include <errno.h>
#endif #endif
@ -196,7 +196,7 @@ namespace Nz
pthread_cond_t TaskSchedulerImpl::s_cvNotEmpty; pthread_cond_t TaskSchedulerImpl::s_cvNotEmpty;
pthread_barrier_t TaskSchedulerImpl::s_barrier; pthread_barrier_t TaskSchedulerImpl::s_barrier;
#if defined(NAZARA_PLATFORM_MACOSX) #if defined(NAZARA_PLATFORM_MACOS)
//Code from https://blog.albertarmea.com/post/47089939939/using-pthreadbarrier-on-mac-os-x //Code from https://blog.albertarmea.com/post/47089939939/using-pthreadbarrier-on-mac-os-x
int TaskSchedulerImpl::pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count) int TaskSchedulerImpl::pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count)
{ {

4
src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
View File

@ -13,7 +13,7 @@
#include <queue> #include <queue>
#include <pthread.h> #include <pthread.h>
#if defined(NAZARA_PLATFORM_MACOSX) #if defined(NAZARA_PLATFORM_MACOS)
typedef int pthread_barrierattr_t; typedef int pthread_barrierattr_t;
typedef struct typedef struct
{ {
@ -57,7 +57,7 @@ namespace Nz
static pthread_cond_t s_cvNotEmpty; static pthread_cond_t s_cvNotEmpty;
static pthread_barrier_t s_barrier; static pthread_barrier_t s_barrier;
#if defined(NAZARA_PLATFORM_MACOSX) #if defined(NAZARA_PLATFORM_MACOS)
static int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count); static int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count);
static int pthread_barrier_destroy(pthread_barrier_t *barrier); static int pthread_barrier_destroy(pthread_barrier_t *barrier);
static int pthread_barrier_wait(pthread_barrier_t *barrier); static int pthread_barrier_wait(pthread_barrier_t *barrier);