Changeset e8c8d00 for protocols/msn/msn.h

Timestamp:

2010-03-17T15:15:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• protocols/msn/msn.h (modified) (3 diffs)

protocols/msn/msn.h

@@ -98 +98 @@
 struct msn_away_state
 {
-        int number;
         char code[4];
         char name[16];
@@ -137 +136 @@
 #define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
-int msn_chat_id;
+extern int msn_chat_id;
 extern const struct msn_away_state msn_away_state_list[];
 extern const struct msn_status_code msn_status_code_list[];
@@ -146 +145 @@
    connection), the callback should check whether it's still listed here
    before doing *anything* else. */
-GSList *msn_connections;
-GSList *msn_switchboards;
+extern GSList *msn_connections;
+extern GSList *msn_switchboards;
 
 /* ns.c */