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 468d6cea9b46b6dde79aa6d070a2919dbb8120ca..01621c1dedf00909dfc8dec72ed48a60194ae663 100644 (file)
--- 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 1c5baeded8aec48a733766514d6ae26aadc53935..ad25875cfe782474c5dc37f35ff9c6915bfe84f2 100755 (executable)
--- 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 1a783153eae944ad333f0a9cdd4b656b92c22d11..d05ee438d5bd648b1c3286ea952189d16a0efabb 100644 (file)
--- 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);