diff options
| author | Jim Huang <jserv@biilabs.io> | 2019-06-23 15:29:41 +0800 |
|---|---|---|
| committer | Jim Huang <jserv.tw@gmail.com> | 2019-06-24 10:15:50 +0800 |
| commit | a667971cbf15e413fe7fb81ed936227cc9fe2562 (patch) | |
| tree | 1d672470f03dd076cd594fc24ea37cc40a359720 /include/mimalloc-internal.h | |
| parent | 3526b09903534c8e106c6957dc3c3848a243e171 (diff) | |
Apple rebrands "OS X" as "macOS"
In 2012, with the release of OS X 10.8 Mountain Lion, the name of the
system was shortened from Mac OS X to OS X. In 2016, with the release
of macOS 10.12 Sierra, the name was changed from OS X to macOS to
streamline it with the branding of Apple's other primary operating
systems: iOS, watchOS, and tvOS.
Reference: https://en.wikipedia.org/wiki/MacOS
Diffstat (limited to 'include/mimalloc-internal.h')
| -rw-r--r-- | include/mimalloc-internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index 74f0ca3..a1bb240 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -146,7 +146,7 @@ extern mi_decl_thread mi_heap_t* _mi_heap_default; // default heap to allocate static inline mi_heap_t* mi_get_default_heap() { #ifdef MI_TLS_RECURSE_GUARD - // on some platforms, like MacOSX, the dynamic loader calls `malloc` + // on some platforms, like macOS, the dynamic loader calls `malloc` // to initialize thread local data. To avoid recursion, we need to avoid // accessing the thread local `_mi_default_heap` until our module is loaded // and use the statically allocated main heap until that time. @@ -300,7 +300,7 @@ static inline uintptr_t _mi_thread_id() mi_attr_noexcept { #if defined(__i386__) __asm__("movl %%gs:0, %0" : "=r" (tid) : : ); // 32-bit always uses GS #elif defined(__MACH__) - __asm__("movq %%gs:0, %0" : "=r" (tid) : : ); // x86_64 MacOSX uses GS + __asm__("movq %%gs:0, %0" : "=r" (tid) : : ); // x86_64 macOS uses GS #elif defined(__x86_64__) __asm__("movq %%fs:0, %0" : "=r" (tid) : : ); // x86_64 Linux, BSD uses FS #elif defined(__arm__) |