Merge pull request #29536 from chrisamanse/fixWindows

compnerd · web-flow · commit 6f6d7865cf32 · 2020-01-29T19:24:38.000-08:00
Private method should be for non-Windows only
diff --git a/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift b/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
@@ -82,6 +82,7 @@ public func _stdlib_thread_barrier_init(
   return 0
 }
 
+#if !os(Windows)
 private func _stdlib_thread_barrier_mutex_and_cond_init(_ barrier: UnsafeMutablePointer<_stdlib_thread_barrier_t>) -> CInt {
   guard pthread_mutex_init(barrier.pointee.mutex!, nil) == 0 else {
     return -1
@@ -92,6 +93,7 @@ private func _stdlib_thread_barrier_mutex_and_cond_init(_ barrier: UnsafeMutable
   }
   return 0
 }
+#endif
 
 public func _stdlib_thread_barrier_destroy(
   _ barrier: UnsafeMutablePointer<_stdlib_thread_barrier_t>

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public func _stdlib_thread_barrier_init(`
`82`	`82`	`return 0`
`83`	`83`	`}`
`84`	`84`
	`85`	`+#if !os(Windows)`
`85`	`86`	`private func _stdlib_thread_barrier_mutex_and_cond_init(_ barrier: UnsafeMutablePointer<_stdlib_thread_barrier_t>) -> CInt {`
`86`	`87`	`guard pthread_mutex_init(barrier.pointee.mutex!, nil) == 0 else {`
`87`	`88`	`return -1`
`@@ -92,6 +93,7 @@ private func _stdlib_thread_barrier_mutex_and_cond_init(_ barrier: UnsafeMutable`
`92`	`93`	`}`
`93`	`94`	`return 0`
`94`	`95`	`}`
	`96`	`+#endif`
`95`	`97`
`96`	`98`	`public func _stdlib_thread_barrier_destroy(`
`97`	`99`	`_ barrier: UnsafeMutablePointer<_stdlib_thread_barrier_t>`