diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-15 14:35:24 +0100 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-11-15 14:35:24 +0100 | 
| commit | f56c4917aa26670c03ef9cf4ecdfe2f7fad92aed (patch) | |
| tree | a2fc70cee9c464823577e425fa6cdbc2d836a766 /protocols/oscar | |
| parent | abe53d3c48a6552e136ddc8bc554764daf255a05 (diff) | |
| parent | b135438c4c6aeb5a7cd3403f0cf37e741d589cd3 (diff) | |
Merge new changes from pluginable and Wilmer
Diffstat (limited to 'protocols/oscar')
| -rw-r--r-- | protocols/oscar/aim_internal.h | 1 | ||||
| -rw-r--r-- | protocols/oscar/faimconfig.h | 0 | ||||
| -rw-r--r-- | protocols/oscar/snac.c | 4 | 
3 files changed, 3 insertions, 2 deletions
| diff --git a/protocols/oscar/aim_internal.h b/protocols/oscar/aim_internal.h index 2e36c961..29c16b9f 100644 --- a/protocols/oscar/aim_internal.h +++ b/protocols/oscar/aim_internal.h @@ -106,7 +106,6 @@ typedef struct aim_snac_s {  } aim_snac_t;  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);  void aim_cleansnacs(aim_session_t *, int maxage); diff --git a/protocols/oscar/faimconfig.h b/protocols/oscar/faimconfig.h deleted file mode 100644 index e69de29b..00000000 --- a/protocols/oscar/faimconfig.h +++ /dev/null diff --git a/protocols/oscar/snac.c b/protocols/oscar/snac.c index e2bac179..8a75b2a0 100644 --- a/protocols/oscar/snac.c +++ b/protocols/oscar/snac.c @@ -14,6 +14,8 @@  #include <aim.h> +static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac); +  /*   * Called from aim_session_init() to initialize the hash.   */ @@ -50,7 +52,7 @@ aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guin   * Clones the passed snac structure and caches it in the   * 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;  	int index; | 
