averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stdlib/private][gardening] Prefer os(macOS) over os(OSX)

Browse Source
This commit is contained in:
Sho Ikeda
2018-03-09 22:41:55 +09:00
parent 3e388b35f6
commit 6263b582a0
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdlib/private/StdlibUnittest/RaceTest.swift
View File

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

2
stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
View File

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

6
stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
View File

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

2
stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
View File

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

2
stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
View File

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

2
stdlib/private/SwiftPrivatePthreadExtras/PthreadBarriers.swift
View File

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

2
stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift
View File

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