Skip to content

Fixes for Darwin: fallback for systems without libdispatch; fix for undefined types from inttypes.h #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcat merged 1 commit into from
May 28, 2023
Merged

Fixes for Darwin: fallback for systems without libdispatch; fix for undefined types from inttypes.h #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ void althrd_setname(const char *name [[maybe_unused]])
#endif
}

#ifdef __APPLE__
/* Do not try using libdispatch on systems where it is absent. */
#if defined(__APPLE__) && ((MAC_OS_X_VERSION_MIN_REQUIRED > 1050) && !defined(__ppc__))

namespace al {

Expand Down
7 changes: 6 additions & 1 deletion common/threads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
#endif

#if defined(__APPLE__)
#include <AvailabilityMacros.h>
#if (MAC_OS_X_VERSION_MIN_REQUIRED > 1050) && !defined(__ppc__)
#include <dispatch/dispatch.h>
#else
#include <semaphore.h> /* Fallback option for Apple without a working libdispatch */
#endif
#elif !defined(_WIN32)
#include <semaphore.h>
#endif
Expand All @@ -27,7 +32,7 @@ namespace al {
class semaphore {
#ifdef _WIN32
using native_type = void*;
#elif defined(__APPLE__)
#elif defined(__APPLE__) && ((MAC_OS_X_VERSION_MIN_REQUIRED > 1050) && !defined(__ppc__))
using native_type = dispatch_semaphore_t;
#else
using native_type = sem_t;
Expand Down