diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-19 23:00:56 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-19 23:00:56 +0000 |
| commit | c289b6f820ea8006d84b3de13c9052dcb99ec99c (patch) | |
| tree | 2d73ec2b0ed08621e9a094d136a13fab7d3d8410 /protocols | |
| parent | c48a033d62bb5c5188a876b182d50144ffaed68b (diff) | |
| parent | 36cf9fda6a5cc4bcbfe98319b48af636fa142590 (diff) | |
Merging in head. I want to roll a 1.2.4-2 that fixes the libresolv issues.
Having the include files fixed is a nice extra.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/jabber/jabber.h | 3 | ||||
| -rw-r--r-- | protocols/nogaim.c | 4 | ||||
| -rw-r--r-- | protocols/nogaim.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index ee453144..1180d2b9 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -26,8 +26,9 @@ #include <glib.h> -#include "xmltree.h" #include "bitlbee.h" +#include "md5.h" +#include "xmltree.h" extern GSList *jabber_connections; diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 710b7645..21f7dcb1 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -32,9 +32,11 @@ */ #define BITLBEE_CORE -#include "nogaim.h" #include <ctype.h> +#include "nogaim.h" +#include "chat.h" + static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ); GSList *connections; diff --git a/protocols/nogaim.h b/protocols/nogaim.h index 1e5df503..dc6154e2 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -38,11 +38,12 @@ #ifndef _NOGAIM_H #define _NOGAIM_H +#include <stdint.h> + #include "bitlbee.h" #include "account.h" #include "proxy.h" #include "query.h" -#include "md5.h" #define BUDDY_ALIAS_MAXLEN 388 /* because MSN names can be 387 characters */ |