From 54ca483cc785dff5af47555e974075e99f035ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 19 Mar 2022 23:45:26 +0100 Subject: [PATCH] macOS fix --- src/Nazara/Core/Posix/FileImpl.hpp | 2 +- src/Nazara/Core/Posix/TaskSchedulerImpl.cpp | 4 ++-- src/Nazara/Core/Posix/TaskSchedulerImpl.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Core/Posix/FileImpl.hpp b/src/Nazara/Core/Posix/FileImpl.hpp index 9e7ef76a3..655ae64b7 100644 --- a/src/Nazara/Core/Posix/FileImpl.hpp +++ b/src/Nazara/Core/Posix/FileImpl.hpp @@ -16,7 +16,7 @@ #include #include -#if defined(NAZARA_PLATFORM_MACOSX) +#if defined(NAZARA_PLATFORM_MACOS) #define Stat stat #define Fstat fstat #define Off_t off_t diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp index 6d429932a..6a51d522a 100644 --- a/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp +++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.cpp @@ -6,7 +6,7 @@ #include #include -#if defined(NAZARA_PLATFORM_MACOSX) +#if defined(NAZARA_PLATFORM_MACOS) #include #endif @@ -196,7 +196,7 @@ namespace Nz pthread_cond_t TaskSchedulerImpl::s_cvNotEmpty; 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 int TaskSchedulerImpl::pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count) { diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp index 422d7c0c7..e8207c6f9 100644 --- a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp +++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp @@ -13,7 +13,7 @@ #include #include -#if defined(NAZARA_PLATFORM_MACOSX) +#if defined(NAZARA_PLATFORM_MACOS) typedef int pthread_barrierattr_t; typedef struct { @@ -57,7 +57,7 @@ namespace Nz static pthread_cond_t s_cvNotEmpty; 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_destroy(pthread_barrier_t *barrier); static int pthread_barrier_wait(pthread_barrier_t *barrier);