Merge pull request swiftlang#15106 from ikesyo/if-os-macos-stdlib-private

Author: swift-ci

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -39,7 +39,7 @@
 import SwiftPrivate
 import SwiftPrivateLibcExtras
 import SwiftPrivatePthreadExtras
-#if os(OSX) || os(iOS)
+#if os(macOS) || os(iOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -12,7 +12,7 @@
 
 import SwiftPrivate
 import SwiftPrivateLibcExtras
-#if os(OSX) || os(iOS)
+#if os(macOS) || os(iOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -18,7 +18,7 @@ import SwiftPrivate
 import SwiftPrivatePthreadExtras
 import SwiftPrivateLibcExtras
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc
@@ -1406,7 +1406,7 @@ public final class TestSuite {
   var _testNameToIndex: [String : Int] = [:]
 }
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 @_silgen_name("getSystemVersionPlistProperty")
 func _getSystemVersionPlistPropertyImpl(
   _ propertyName: UnsafePointer<CChar>) -> UnsafePointer<CChar>?
@@ -1510,7 +1510,7 @@ func _getOSVersion() -> OSVersion {
 #else
   let productVersion = _getSystemVersionPlistProperty("ProductVersion")!
   let (major, minor, bugFix) = _parseDottedVersionTriple(productVersion)
-  #if os(OSX)
+  #if os(macOS)
   return .osx(major: major, minor: minor, bugFix: bugFix)
   #elseif os(iOS)
   return .iOS(major: major, minor: minor, bugFix: bugFix)

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftPrivate
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc

stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftPrivate
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc

stdlib/private/SwiftPrivatePthreadExtras/PthreadBarriers.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc

stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift

@@ -15,7 +15,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc