Commit fe71fd98 authored by Romain Bignon's avatar Romain Bignon

fixes for gcc 4.7

parent bb1e039f
......@@ -18,6 +18,7 @@
#include <cassert>
#include <cstring>
#include <unistd.h>
#ifdef HAVE_IMLIB
#include <Imlib2.h>
#endif /* HAVE_IMLIB */
......
......@@ -18,6 +18,7 @@
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include "request.h"
#include "buddy.h"
......
......@@ -23,6 +23,7 @@
#include <string.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
#include "dcc.h"
#include "nick.h"
......
......@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
Buddy* IRC::getNick(const im::Buddy& buddy) const
{
map<string, Nick*>::const_iterator it;
Buddy* nb;
Buddy* nb = NULL;
for(it = users.begin();
it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy);
++it)
......@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const
ConvNick* IRC::getNick(const im::Conversation& conv) const
{
map<string, Nick*>::const_iterator it;
ConvNick* n;
ConvNick* n = NULL;
for(it = users.begin();
it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
++it)
......
......@@ -18,6 +18,7 @@
#include <cassert>
#include <glib.h>
#include <unistd.h>
#include "inetd.h"
#include "irc/irc.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment