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 /sal/osl/unx | |
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 'sal/osl/unx')
-rw-r--r-- | sal/osl/unx/osxlocale.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/salinit.cxx | 4 | ||||
-rw-r--r-- | sal/osl/unx/security.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/signal.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/system.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/uunxapi.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx index 7bd611d85c17..f82ea1436c71 100644 --- a/sal/osl/unx/osxlocale.cxx +++ b/sal/osl/unx/osxlocale.cxx @@ -94,7 +94,7 @@ OUString macosx_getLocale() buf.append("_"); append(buf, static_cast<CFStringRef>(CFArrayGetValueAtIndex(subs, 1))); } - // Append 'UTF-8' to the locale because the Mac OS X file + // Append 'UTF-8' to the locale because the macOS file // system interface is UTF-8 based and sal tries to determine // the file system locale from the locale information buf.append(".UTF-8"); diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index bfec16a96677..81a2d02ca31e 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -46,7 +46,7 @@ extern "C" { void sal_detail_initialize(int argc, char ** argv) { #if defined MACOSX && !HAVE_FEATURE_MACOSX_SANDBOX - // On OS X when not sandboxed, soffice can restart itself via exec (see + // On macOS when not sandboxed, soffice can restart itself via exec (see // restartOnMac in desktop/source/app/app.cxx), which leaves all file // descriptors open, which in turn can have unwanted effects (see // <https://bugs.libreoffice.org/show_bug.cgi?id=50603> "Unable to update @@ -58,7 +58,7 @@ void sal_detail_initialize(int argc, char ** argv) { // yet that might already have opened some fds); this is done for all kinds // of processes here, not just soffice, but hopefully none of our processes // rely on being spawned with certain fds already open. Unfortunately, Mac - // OS X appears to have no better interface to close all fds (like + // macOS appears to have no better interface to close all fds (like // closefrom): long openMax = sysconf(_SC_OPEN_MAX); if (openMax == -1) { diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index a7a47640c693..e545842290dc 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -72,7 +72,7 @@ static bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { *value = static_cast<std::size_t>(m); return true; #else - /* some platforms like Mac OS X 1.3 do not define _SC_GETPW_R_SIZE_MAX: */ + /* some platforms like macOS 1.3 do not define _SC_GETPW_R_SIZE_MAX: */ return false; #endif } diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 3ea564e14736..085f14d8ec0c 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -294,7 +294,7 @@ bool onInitSignal() } } - /* Clear signal mask inherited from parent process (on Mac OS X, upon a + /* Clear signal mask inherited from parent process (on macOS, upon a crash soffice re-execs itself from within the signal handler, so the second soffice would have the guilty signal blocked and would freeze upon encountering a similar crash again): */ diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx index dee35f5c3b92..2abbc24c0bd4 100644 --- a/sal/osl/unx/system.cxx +++ b/sal/osl/unx/system.cxx @@ -30,7 +30,7 @@ #if defined(MACOSX) || defined(IOS) || defined(OPENBSD) || defined(NETBSD) || defined(HAIKU) -//No mutex needed on Mac OS X, gethostbyname is thread safe +//No mutex needed on macOS, gethostbyname is thread safe #if defined(MACOSX) diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index c3cccabb4d9e..b36c3ddc1790 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -379,7 +379,7 @@ int utime_c(const char *cpPath, struct utimbuf *times) int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path) { - /* When sandboxed on OS X, ftruncate(), even if it takes an + /* When sandboxed on macOS, ftruncate(), even if it takes an * already open file descriptor which was returned from an open() * call already checked by the sandbox, still requires a security * scope bookmark for the file to be active in case the file is |