Changeset b75acf6

Timestamp:

2009-10-22T21:55:23Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4cf80bb

Parents:

2e44b1f

Message:

Don't include chat.h from bitlbee.h. make install-dev doesn't install
chat.h and it shouldn't ... but things broke because bitlbee.h includes
it. Fixes #534.

Files:

• account.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• chat.c (modified) (1 diff)
• chat.h (modified) (2 diffs)
• irc_commands.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
+#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )

bitlbee.h

@@ -129 +129 @@
 #include "account.h"
 #include "nick.h"
-#include "chat.h"
 #include "conf.h"
 #include "log.h"

chat.c

@@ -25 +25 @@
 
 #include "bitlbee.h"
+#include "chat.h"
 
 struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )

chat.h

@@ -24 +24 @@
 */
 
+#ifndef _CHAT_H
+#define _CHAT_H
+
 struct chat
 {
@@ -45 +48 @@
 
 int chat_join( irc_t *irc, struct chat *c, const char *password );
+
+#endif

irc_commands.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "ipc.h"
+#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )

protocols/nogaim.h

@@ -44 +44 @@
 #include "query.h"
 #include "md5.h"
+#include "chat.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "chat.h"
 
 #include <string.h>

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include "chat.h"
 
 #if GLIB_CHECK_VERSION(2,8,0)