From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 28 Sep 2009 02:21:43 +0000 (+0000)
Subject: Fix linking errors on BSD
X-Git-Tag: v2.0.23~1478
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=d811ffeda29eff11fb0a381f5f17b6d65ae0460b;hp=7c1509e0a79ede51146d38469e63c1437f2d4907;p=user%2Fhenk%2Fcode%2Finspircd.git

Fix linking errors on BSD

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11774 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/include/socketengines/socketengine_kqueue.h b/include/socketengines/socketengine_kqueue.h
index 468d6cea9..01621c1de 100644
--- a/include/socketengines/socketengine_kqueue.h
+++ b/include/socketengines/socketengine_kqueue.h
@@ -48,7 +48,6 @@ public:
 	virtual bool DelFd(EventHandler* eh, bool force = false);
 	virtual int DispatchEvents();
 	virtual std::string GetName();
-	virtual void WantWrite(EventHandler* eh);
 	virtual void RecoverFromFork();
 };
 
diff --git a/make/calcdep.pl b/make/calcdep.pl
index 1c5baeded..ad25875cf 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -73,7 +73,7 @@ END
 	print MAKE <<END;
 
 bin/inspircd: $core_mk
-	\$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^
+	cd \$(BUILDPATH); \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
 
 inspircd: bin/inspircd
 modules: $mods
@@ -154,7 +154,7 @@ sub dep_dir($) {
 	closedir DIR;
 	if (@ofiles) {
 		my $ofiles = join ' ', @ofiles;
-		print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^\n";
+		print MAKE "$dir.so: $ofiles\n\tcd \$(BUILDPATH); \$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^ \$>\n";
 		return 1;
 	} else {
 		return 0;
diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 1a783153e..d05ee438d 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -76,13 +76,9 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
 		return false;
 	}
 
-	if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) {
-		// ...and sometimes want to write
-		WantWrite(eh);
-	}
-
 	ref[fd] = eh;
 	SocketEngine::SetEventMask(eh, event_mask);
+	OnSetEvent(eh, 0, event_mask);
 	CurrentSetSize++;
 
 	ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);