diff options
| -rw-r--r-- | include/socketengines/socketengine_kqueue.h | 1 | ||||
| -rwxr-xr-x | make/calcdep.pl | 4 | ||||
| -rw-r--r-- | src/socketengines/socketengine_kqueue.cpp | 6 |
3 files changed, 3 insertions, 8 deletions
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); |