summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJim Huang <jserv@biilabs.io>2019-06-23 15:29:41 +0800
committerJim Huang <jserv.tw@gmail.com>2019-06-24 10:15:50 +0800
commita667971cbf15e413fe7fb81ed936227cc9fe2562 (patch)
tree1d672470f03dd076cd594fc24ea37cc40a359720 /doc
parent3526b09903534c8e106c6957dc3c3848a243e171 (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 'doc')
-rw-r--r--doc/mimalloc-doc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/mimalloc-doc.h b/doc/mimalloc-doc.h
index 184e5c5..69367e6 100644
--- a/doc/mimalloc-doc.h
+++ b/doc/mimalloc-doc.h
@@ -648,7 +648,7 @@ The `mimalloc` project builds a static library (in `out/msvc-x64`), while the
`mimalloc-override` project builds a DLL for overriding malloc
in the entire program.
-## MacOSX, Linux, BSD, etc.
+## macOS, Linux, BSD, etc.
We use [`cmake`](https://cmake.org)<sup>1</sup> as the build system:
@@ -772,14 +772,14 @@ Overriding the standard `malloc` can be done either _dynamically_ or _statically
This is the recommended way to override the standard malloc interface.
-### Unix, BSD, MacOSX
+### Unix, BSD, macOS
On these systems we preload the mimalloc shared
library so all calls to the standard `malloc` interface are
resolved to the _mimalloc_ library.
- `env LD_PRELOAD=/usr/lib/libmimalloc.so myprogram` (on Linux, BSD, etc.)
-- `env DYLD_INSERT_LIBRARIES=usr/lib/libmimalloc.dylib myprogram` (On MacOSX)
+- `env DYLD_INSERT_LIBRARIES=usr/lib/libmimalloc.dylib myprogram` (On macOS)
Note certain security restrictions may apply when doing this from
the [shell](https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash).