Fix Windows build and a few more problems

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / fjoin.cpp

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 21327581a55bca8f85553ae4bc2a0b29fe455c6d..93320757c7e8249c4fae49dac12e37b6ff87f0e3 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -26,7 +26,7 @@
 #include "treesocket.h"
 
 /** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
-CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *srcuser)
+CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 {
        /* 1.1+ FJOIN works as follows:
         *
@@ -133,7 +133,7 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
        }
 
        irc::modestacker modestack(true);
-       TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetRoute()->GetSocket();
+       TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetSocket();
 
        /* Now, process every 'modes,uuid' pair */
        irc::tokenstream users(*params.rbegin());