Merge pull request #755 from lionello/fixed_libev

Fixe --config=libev build.
vibe-d · Jul 30, 2014 · f82f61c · f82f61c
2 parents c2e7e15 + b2344bf
commit f82f61c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/vibe/core/drivers/libev.d b/source/vibe/core/drivers/libev.d
@@ -218,7 +218,7 @@ final class LibevDriver : EventDriver {
 		assert(false);
 	}
 
-	private LibevTCPListener listenTCPGeneric(SOCKADDR)(int af, SOCKADDR* sock_addr, ushort port, void delegate(TCPConnection conn) connection_callback)
+	private LibevTCPListener listenTCPGeneric(SOCKADDR)(int af, SOCKADDR* sock_addr, ushort port, void delegate(TCPConnection conn) connection_callback, TCPListenOptions options)
 	{
 		auto listenfd = socket(af, SOCK_STREAM, 0);
 		if( listenfd == -1 ){
@@ -483,6 +483,7 @@ final class LibevTCPConnection : TCPConnection {
 		int m_eventsExpected = 0;
 		Appender!(ubyte[]) m_writeBuffer;
 		bool m_tcpNoDelay = false;
+		bool m_keepAlive = false;
 		Duration m_readTimeout;
 	}
 

diff --git a/source/vibe/core/drivers/native.d b/source/vibe/core/drivers/native.d
@@ -9,7 +9,7 @@ module vibe.core.drivers.native;
 
 version (VibeLibevDriver) {
 	import vibe.core.drivers.libev;
-	alias NativeEventDriver = Win32EventDriver;
+	alias NativeEventDriver = LibevDriver;
 } else version (VibeLibeventDriver) {
 	import vibe.core.drivers.libevent2;
 	alias NativeEventDriver = Libevent2Driver;