make sure we include the right headers and fix a warning in cmode_b

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

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 3fb77f02ff91e86b01955268b406a2d96fd61619..1efb5d399e31d7d79930bc09e5de14ad130dc260 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -76,7 +76,7 @@ void ModeChannelBan::DisplayList(User* user, Channel* channel)
        /* Display the channel banlist */
        for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
        {
-               user->WriteServ("367 %s %s %s %s %ld",user->nick, channel->name, i->data, i->set_by, i->set_time);
+               user->WriteServ("367 %s %s %s %s %lu",user->nick, channel->name, i->data, i->set_by, (unsigned long)i->set_time);
        }
        user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
        return;

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 0fb14c29f0de9789b8d8f0c22dbf54099242cfcf..5fabb5b8de62be950c465e2888f2dccd767b3c98 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -17,7 +17,7 @@
 #include <sys/event.h>
 #include <sys/time.h>
 #include "socketengines/socketengine_kqueue.h"
-#include <ulimit.h>
+#include <sys/sysctl.h>
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
@@ -130,9 +130,8 @@ int KQueueEngine::GetMaxFds()
                mib[1] = KERN_MAXFILES;
                len = sizeof(maxfiles);
                sysctl(mib, 2, &maxfiles, &len, NULL, 0);
-
                MAX_DESCRIPTORS = maxfiles;
-               return max;
+               return maxfiles;
        }
        return MAX_DESCRIPTORS;
 }