Migrate to OS_MAC and OS_APPLE in base
This migrates:
defined(OS_MACOSX) -> defined(OS_APPLE)
defined(OS_MACOSX) && !defined(OS_IOS) -> defined(OS_MAC)
!defined(OS_MACOSX) || defined(OS_IOS) -> !defined(OS_MAC)
Bug: 1105907
Change-Id: I29e66db0baaa7cf1aa6e16a385f99b6d398bcde6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321211
Commit-Queue: Avi Drissman <[email protected]>
Reviewed-by: Mark Mentovai <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Reviewed-by: Alexei Svitkine <[email protected]>
Cr-Commit-Position: refs/heads/master@{#792435}
diff --git a/base/logging.cc b/base/logging.cc
index ea62d889..11229fe 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -33,7 +33,7 @@
// Windows doesn't define STDERR_FILENO. Define it here.
#define STDERR_FILENO 2
-#elif defined(OS_MACOSX)
+#elif defined(OS_APPLE)
// In MacOS 10.12 and iOS 10.0 and later ASL (Apple System Log) was deprecated
// in favor of OS_LOG (Unified Logging).
#include <AvailabilityMacros.h>
@@ -193,7 +193,7 @@
#elif defined(OS_FUCHSIA)
return zx_clock_get_monotonic() /
static_cast<zx_time_t>(base::Time::kNanosecondsPerMicrosecond);
-#elif defined(OS_MACOSX)
+#elif defined(OS_APPLE)
return mach_absolute_time();
#elif defined(OS_NACL)
// NaCl sadly does not have _POSIX_TIMERS enabled in sys/features.h
@@ -572,7 +572,7 @@
if ((g_logging_destination & LOG_TO_SYSTEM_DEBUG_LOG) != 0) {
#if defined(OS_WIN)
OutputDebugStringA(str_newline.c_str());
-#elif defined(OS_MACOSX)
+#elif defined(OS_APPLE)
// In LOG_TO_SYSTEM_DEBUG_LOG mode, log messages are always written to
// stderr. If stderr is /dev/null, also log via ASL (Apple System Log) or
// its successor OS_LOG. If there's something weird about stderr, assume
