Browse Source

Fixed build for Linux/Swift-3.0-dev

kolakowski 10 năm trước cách đây
mục cha
commit
04ad3fb6ed
3 tập tin đã thay đổi với 19 bổ sung5 xóa
  1. 6 1
      Sources/String+BASE64.swift
  2. 6 2
      Sources/String+Misc.swift
  3. 7 2
      Sources/String+SHA1.swift

+ 6 - 1
Sources/String+BASE64.swift

@@ -5,7 +5,12 @@
 //  Copyright © 2016 Damian Kołakowski. All rights reserved.
 //
 
-import Foundation
+#if os(Linux)
+    import Glibc
+#else
+    import Foundation
+#endif
+
 
 extension String {
     

+ 6 - 2
Sources/String+Misc.swift

@@ -5,7 +5,11 @@
 //  Copyright (c) 2014-2016 Damian Kołakowski. All rights reserved.
 //
 
-import Foundation
+#if os(Linux)
+    import Glibc
+#else
+    import Foundation
+#endif
 
 extension String {
 
@@ -41,7 +45,7 @@ extension String {
     }
     
     public static func fromUInt8(array: [UInt8]) -> String {
-        return String(data: NSData(bytes: array, length: array.count), encoding: NSUTF8StringEncoding) ?? ""
+	return String(array)
     }
     
     public func removePercentEncoding() -> String {

+ 7 - 2
Sources/String+SHA1.swift

@@ -5,7 +5,12 @@
 //  Copyright 2014-2016 Damian Kołakowski. All rights reserved.
 //
 
-import Foundation
+#if os(Linux)
+    import Glibc
+#else
+    import Foundation
+#endif
+
 
 extension String {
     
@@ -131,4 +136,4 @@ extension String {
     func rotateLeft(v: UInt32, _ n: UInt32) -> UInt32 {
         return ((v << n) & 0xFFFFFFFF) | (v >> (32 - n))
     }
-}
+}