diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-02 18:05:25 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-02 18:05:25 +0000 |
| commit | 1290b11508cb44d74e248860f3bfddf32efd878b (patch) | |
| tree | 2a8d1b8d2055648a0c18381d5f7ac7e32533ae05 | |
| parent | 46242bf71b58dc4c563efdc1bb3a0589b0a6fdfc (diff) | |
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
| -rw-r--r-- | src/modes/cmode_b.cpp | 2 | ||||
| -rw-r--r-- | src/socketengines/socketengine_kqueue.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 3fb77f02f..1efb5d399 100644 --- 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 0fb14c29f..5fabb5b8d 100644 --- 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; } |