SwiftWebSocket doesn't have a Mac version

ricardopereira · Jun 20, 2015 · 737c8f4 · 737c8f4
1 parent 4473be5
commit 737c8f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/SocketIOKit.xcodeproj/project.pbxproj b/SocketIOKit.xcodeproj/project.pbxproj
@@ -52,7 +52,6 @@
 		D7904C881B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C561B153B0B00FF50D1 /* SocketIOTransportDelegate.swift */; };
 		D7904C891B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C561B153B0B00FF50D1 /* SocketIOTransportDelegate.swift */; };
 		D7904C8A1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; };
-		D7904C8B1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; };
 		D7904CA71B1545CB00FF50D1 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C2B1B1539EA00FF50D1 /* Tests.swift */; };
 		D7904CAD1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; };
 		D7904CAE1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; };
@@ -446,7 +445,6 @@
 				D7904C751B153B0B00FF50D1 /* SocketIOJSONHandshake.swift in Sources */,
 				D7904C891B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */,
 				D7904C651B153B0B00FF50D1 /* SocketIOCallback.swift in Sources */,
-				D7904C8B1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */,
 				D7904C7D1B153B0B00FF50D1 /* SocketIOPacket.swift in Sources */,
 				D7904C7B1B153B0B00FF50D1 /* SocketIOOptions.swift in Sources */,
 				D7904C791B153B0B00FF50D1 /* SocketIOObject.swift in Sources */,

diff --git a/Source/SocketIO.swift b/Source/SocketIO.swift
@@ -291,3 +291,10 @@ public class SocketIO<T: Printable>: SocketIOReceiver, SocketIOEmitter {
     }
 
 }
+
+// TODO: SwiftWebSocket doesn't have a Mac version!
+#if os(OSX)
+    class SocketIOWebSocket: SocketIOTransport {
+
+    }
+#endif
diff --git a/Source/SocketIOWebSocket.swift b/Source/SocketIOWebSocket.swift
@@ -7,11 +7,7 @@
 //
 
 import Foundation
-
-// TODO: SwiftWebSocket doesn't have a Mac version!
-#if os(iOS)
 import SwiftWebSocket
-#endif
 
 private enum WSScheme: String {
     case WS = "ws"
@@ -20,7 +16,6 @@ private enum WSScheme: String {
 
 class SocketIOWebSocket: SocketIOTransport {
 
-    #if os(iOS)
     private var ws: WebSocket!
     private let defaultPort = 80
     private var pingTimer: NSTimer?
@@ -301,6 +296,5 @@ class SocketIOWebSocket: SocketIOTransport {
             println("Ping")
         #endif
     }
-    #endif
 
 }