Merge pull request #14 from crossroadlabs/develop

Develop

Author: dileping

ExecutionContext/DefaultExecutionContext.swift

@@ -16,13 +16,13 @@
 
 import Foundation
 
-#if os(Linux)
+#if !os(Linux) || dispatch
 
-    public typealias DefaultExecutionContext = PThreadExecutionContext
+    public typealias DefaultExecutionContext = DispatchExecutionContext
 
 #else
 
-    public typealias DefaultExecutionContext = DispatchExecutionContext
+    public typealias DefaultExecutionContext = PThreadExecutionContext
 
 #endif
 

ExecutionContext/DispatchExecutionContext.swift

@@ -14,7 +14,7 @@
 //limitations under the License.
 //===----------------------------------------------------------------------===//
 
-#if !os(Linux)
+#if !os(Linux) || dispatch
 
     import Foundation
     import Dispatch

ExecutionContext/ExecutionContext.swift

@@ -17,6 +17,10 @@
 import Foundation
 import Result
 
+#if !os(Linux) || dispatch
+    import Dispatch
+#endif
+
 public typealias Task = () throws -> Void
 public typealias SafeTask = () -> Void
 
@@ -163,9 +167,9 @@ public func sleep(timeout:Double) {
 }
 
 @noreturn public func executionContextMain() {
-    //#if os(Linux)
+    #if !os(Linux) || dispatch
+        dispatch_main()
+    #else
         RunLoop.runForever()
-    //#else
-    //    dispatch_main()
-    //#endif
+    #endif
 }

ExecutionContext/LoopSemaphore.swift

@@ -15,11 +15,9 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-#if os(Linux)
 import CoreFoundation
-#endif
 
-#if !os(Linux)
+#if !os(Linux) || dispatch
     import Dispatch
 
     public class DispatchLoopSemaphore : SemaphoreType {
@@ -144,8 +142,8 @@ public class CFRunLoopSemaphore : SemaphoreType {
     }
 }
 
-#if os(Linux)
-    public typealias LoopSemaphore = CFRunLoopSemaphore
-#else
+#if !os(Linux) || dispatch
     public typealias LoopSemaphore = DispatchLoopSemaphore
+#else
+    public typealias LoopSemaphore = CFRunLoopSemaphore
 #endif