Compilation for epoll system

Former-commit-id: bee20b5
PerfectlySoft · Apr 20, 2016 · f241368 · f241368
1 parent abedaea
commit f241368
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 88 deletions.
diff --git a/Package.swift b/Package.swift
@@ -25,11 +25,9 @@ let package = Package(
 	targets: [
 		Target(name: "PerfectLib", dependencies: [
 										.Target(name: "OpenSSL"),
-										.Target(name: "ICU"),
 										.Target(name: "cURL"),
 										.Target(name: "LinuxBridge")]),
 		Target(name: "OpenSSL"),
-		Target(name: "ICU"),
 		Target(name: "cURL"),
 		Target(name: "LinuxBridge")
 		],
@@ -41,10 +39,8 @@ let package = Package(
 	targets: [
 		Target(name: "PerfectLib", dependencies: [
 										.Target(name: "OpenSSL"),
-										.Target(name: "ICU"),
 										.Target(name: "cURL")]),
 		Target(name: "OpenSSL"),
-		Target(name: "ICU"),
 		Target(name: "cURL"),
 		Target(name: "PerfectLibTests", dependencies: [.Target(name: "PerfectLib")])
 		],

diff --git a/Sources/ICU/icu.c b/Sources/ICU/icu.c
diff --git a/Sources/ICU/include/module.modulemap b/Sources/ICU/include/module.modulemap
diff --git a/Sources/ICU/include/p_icu.h b/Sources/ICU/include/p_icu.h
diff --git a/Sources/PerfectLib/NetEvent.swift b/Sources/PerfectLib/NetEvent.swift
@@ -43,9 +43,9 @@ class NetEvent {
 
 	enum Filter {
 		case None, Error(Int32), Read, Write, Timer
-		
+
 		#if os(Linux)
-		var epollEvent: UInt3 {
+		var epollEvent: UInt32 {
 			switch self {
 				case .Read:
 					return EPOLLIN.rawValue
@@ -124,7 +124,7 @@ class NetEvent {
 		let q = Threading.getQueue("NetEvent", type: .Serial)
 		q.dispatch {
 			while true {
-				
+
 #if os(Linux)
 				let nev = Int(epoll_wait(self.kq, self.evlist, Int32(self.numEvents), -1))
 #else
@@ -142,16 +142,14 @@ class NetEvent {
 #if os(Linux)
 						let sock = SocketType(evt.data.fd)
 						var filter = Filter.None
-						if (evt.events & EPOLLERR) != 0 {
+						if (evt.events & EPOLLERR.rawValue) != 0 {
 							var errData = Int32(0)
-							if error {
-								var errLen = socklen_t(sizeof(Int32))
-								getsockopt(sock, SOL_SOCKET, SO_ERROR, &errData, &errLen)
-							}
+							var errLen = socklen_t(sizeof(Int32))
+							getsockopt(sock, SOL_SOCKET, SO_ERROR, &errData, &errLen)
 							filter = .Error(errData)
-						} else if (evt.events & EPOLLIN) != 0 {
+						} else if (evt.events & EPOLLIN.rawValue) != 0 {
 							filter = .Read
-						} else if (evt.events & EPOLLOUT) != 0 {
+						} else if (evt.events & EPOLLOUT.rawValue) != 0 {
 							filter = .Write
 						}
 #else

diff --git a/Sources/PerfectLib/Utilities-Server.swift b/Sources/PerfectLib/Utilities-Server.swift
@@ -17,6 +17,10 @@
 //===----------------------------------------------------------------------===//
 //
 
+#if os(Linux)
+import SwiftGlibc
+#endif
+
 extension UnicodeScalar {
 
 	/// Returns true if the UnicodeScalar is a white space character
@@ -44,4 +48,3 @@ extension UnicodeScalar {
 		}
 	}
 }
-