X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/f7bb124ab7ce9c16f20c7659310996af35c29b49..e677fc4371dedb607e13d60a380a7e0d0becfd8b:/src/login.c

diff --git a/src/login.c b/src/login.c
index e12d973..1687f4b 100644
--- a/src/login.c
+++ b/src/login.c
@@ -430,7 +430,7 @@ faim_export unsigned long aim_sendredirect(struct aim_session_t *sess,
 
 static int hostonline(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int ret = 0;
   unsigned short *families;
   int famcount, i;
@@ -456,7 +456,7 @@ static int redirect(struct aim_session_t *sess, aim_module_t *mod, struct comman
   int serviceid;
   unsigned char *cookie;
   char *ip;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist;
   char *chathack = NULL;
   int chathackex = 0;
@@ -551,7 +551,7 @@ static int redirect(struct aim_session_t *sess, aim_module_t *mod, struct comman
 /* XXX parse this */
 static int rateresp(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
     return userfunc(sess, rx);
@@ -561,7 +561,7 @@ static int rateresp(struct aim_session_t *sess, aim_module_t *mod, struct comman
 
 static int ratechange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int i = 0, code;
   unsigned long currentavg, maxavg;
   unsigned long rateclass, windowsize, clear, alert, limit, disconnect;
@@ -596,7 +596,7 @@ static int ratechange(struct aim_session_t *sess, aim_module_t *mod, struct comm
 /* XXX parse this */
 static int selfinfo(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
     return userfunc(sess, rx);
@@ -606,7 +606,7 @@ static int selfinfo(struct aim_session_t *sess, aim_module_t *mod, struct comman
 
 static int evilnotify(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   int i = 0;
   unsigned short newevil;
   struct aim_userinfo_s userinfo;
@@ -627,7 +627,7 @@ static int evilnotify(struct aim_session_t *sess, aim_module_t *mod, struct comm
 
 static int motd(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   char *msg = NULL;
   int ret = 0;
   struct aim_tlvlist_t *tlvlist;
@@ -663,7 +663,7 @@ static int motd(struct aim_session_t *sess, aim_module_t *mod, struct command_rx
 
 static int hostversions(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int vercount;
 
   vercount = datalen/4;
@@ -713,7 +713,7 @@ static int hostversions(struct aim_session_t *sess, aim_module_t *mod, struct co
  */
 static int memrequest(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   unsigned long offset, len;
   int i = 0;
   struct aim_tlvlist_t *list;