Changeset b135438 for protocols/oscar

Timestamp:

2005-11-15T13:20:27Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

c998255, f56c491

Parents:

f7f3ada (diff), c1ede6e8 (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:

Merge changes from Wilmer

Location:

protocols/oscar

Files:

• aim_internal.h (modified) (1 diff)
• faimconfig.h (deleted)
• snac.c (modified) (2 diffs)

protocols/oscar/aim_internal.h

@@ -107 +107 @@
 
 void aim_initsnachash(aim_session_t *sess);
-aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac);
 aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
 aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id);

protocols/oscar/snac.c

@@ -14 +14 @@
 
 #include <aim.h>
+
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);
 
 /*
@@ -51 +53 @@
  * list/hash.
  */
-aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
 {
         aim_snac_t *snac;