Merge pull request #1927 from gonzoua/freebsd

swift-ci · swift-ci · commit 6edac6ad5601 · 2016-03-29T15:22:06.000-07:00
diff --git a/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
@@ -141,7 +141,7 @@ public func spawnChild(args: [String])
 }
 
 internal func _make_posix_spawn_file_actions_t() -> posix_spawn_file_actions_t {
-#if os(Linux) || os(FreeBSD)
+#if os(Linux)
   return posix_spawn_file_actions_t()
 #else
   return nil
diff --git a/stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift b/stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift
@@ -82,7 +82,7 @@ public func _stdlib_pthread_create_block<Argument, Result>(
 }
 
 internal func _make_pthread_t() -> pthread_t {
-#if os(Linux) || os(FreeBSD)
+#if os(Linux)
   return pthread_t()
 #else
   return nil

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public func spawnChild(args: [String])`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`internal func _make_posix_spawn_file_actions_t() -> posix_spawn_file_actions_t {`
`144`		`-#if os(Linux) \|\| os(FreeBSD)`
	`144`	`+#if os(Linux)`
`145`	`145`	`return posix_spawn_file_actions_t()`
`146`	`146`	`#else`
`147`	`147`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public func _stdlib_pthread_create_block<Argument, Result>(`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`internal func _make_pthread_t() -> pthread_t {`
`85`		`-#if os(Linux) \|\| os(FreeBSD)`
	`85`	`+#if os(Linux)`
`86`	`86`	`return pthread_t()`
`87`	`87`	`#else`
`88`	`88`	`return nil`