diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-27 11:40:49 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-29 14:08:26 +0100 |
| commit | 9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch) | |
| tree | a2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /desktop | |
| parent | a55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff) | |
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/README | 6 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/README b/desktop/README index d82078edddbe..a49f0051ae1f 100644 --- a/desktop/README +++ b/desktop/README @@ -11,13 +11,13 @@ soffice ======= In the "program" directory ("program/" on Linux and Windows, "Contents/MacOS/" -on Mac OS X). +on macOS). unoinfo ======= In the "program" directory ("program/" on Linux and Windows, "Contents/MacOS/" -on Mac OS X). +on macOS). When called with a sole argument of "c++", it prints to stdout an absolute pathname denoting the directory where the public URE libraries are found. @@ -27,7 +27,7 @@ character (either an ASCII '0' or '1') followed by a sequence of zero or more absolute pathnames denoting jars or directories that need to be included in a class loader's search locations. -If the marker character is '0' (on Linux and Mac OS X), the pathnames are +If the marker character is '0' (on Linux and macOS), the pathnames are encoded as bytes, and any two pathnames in the sequence are separated from each other by NUL bytes. diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 257925d71cfa..2291aeb171f4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1101,7 +1101,7 @@ void restartOnMac(bool passArguments) { } argPtrs.push_back(nullptr); execv(execPath8.getStr(), const_cast< char ** >(&argPtrs[0])); - if (errno == ENOTSUP) { // happens when multithreaded on OS X < 10.6 + if (errno == ENOTSUP) { // happens when multithreaded on macOS < 10.6 pid_t pid = fork(); if (pid == 0) { execv(execPath8.getStr(), const_cast< char ** >(&argPtrs[0])); @@ -1843,7 +1843,7 @@ bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rx // unfortunately this broke the Mac behavior which is to always run // in quickstart mode since Mac applications do not usually quit // when the last document closes. - // Note that this claim that on OS X we "always run in quickstart mode" + // Note that this claim that on macOS we "always run in quickstart mode" // has nothing to do with (quick) *starting* (i.e. starting automatically // when the user logs in), though, but with not quitting when no documents // are open. |