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/sync_socket_posix.cc b/base/sync_socket_posix.cc
index 4f30690..35d290a7 100644
--- a/base/sync_socket_posix.cc
+++ b/base/sync_socket_posix.cc
@@ -52,9 +52,9 @@
DCHECK(!socket_a->IsValid());
DCHECK(!socket_b->IsValid());
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
int nosigpipe = 1;
-#endif // defined(OS_MACOSX)
+#endif // defined(OS_APPLE)
ScopedHandle handles[2];
@@ -67,7 +67,7 @@
handles[1].reset(raw_handles[1]);
}
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
// On OSX an attempt to read or write to a closed socket may generate a
// SIGPIPE rather than returning -1. setsockopt will shut this off.
if (0 != setsockopt(handles[0].get(), SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe,
