Changeset b135438 for protocols/oscar


Ignore:
Timestamp:
2005-11-15T13:20:27Z (16 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:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/aim_internal.h

    rf7f3ada rb135438  
    107107
    108108void aim_initsnachash(aim_session_t *sess);
    109 aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac);
    110109aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
    111110aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id);
  • protocols/oscar/snac.c

    rf7f3ada rb135438  
    1414
    1515#include <aim.h>
     16
     17static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);
    1618
    1719/*
     
    5153 * list/hash.
    5254 */
    53 aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
     55static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
    5456{
    5557        aim_snac_t *snac;
Note: See TracChangeset for help on using the changeset viewer.