Skip to content

Commit 0807152

Browse files
committed
apple-related workarounds
1 parent 97d3d52 commit 0807152

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

libmamba/src/core/logging.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace mamba::logging
2323
// and avoid static-init-fiasco.
2424
// But depending on the implementation it is not always possible, so we pay
2525
// the locking cost in these platforms.
26-
#if defined(__apple_build_version__) // apple-clang
26+
#if defined(__apple_build_version__) or (defined(_LIBCPP_VERSION) and _LIBCPP_VERSION < 19) // apple-clang or libc++
2727
using params_mutex = std::mutex;
2828
#else
2929
using params_mutex = std::shared_mutex;

libmamba/src/core/shell_init.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
#include <fmt/ostream.h>
1616
#include <fmt/xchar.h>
1717
#include <reproc++/run.hpp>
18+
1819
#ifdef _WIN32
19-
#include <WinReg.hpp>
20+
# include <WinReg.hpp>
2021

21-
#include "mamba/util/os_win.hpp"
22+
# include "mamba/util/os_win.hpp"
23+
#else
24+
# include <unistd.h>
2225
#endif
2326

2427
#include "mamba/core/activation.hpp"

0 commit comments

Comments
 (0)