From e677fc4371dedb607e13d60a380a7e0d0becfd8b Mon Sep 17 00:00:00 2001
From: mid <mid>
Date: Mon, 7 May 2001 22:26:17 +0000
Subject: [PATCH]  - Mon May  7 15:19:55 PDT 2001   - Rename rxhandler_t to
 aim_rxhandler_t.  This has been      bugging me for a while.

---
 CHANGES                |  4 ++++
 include/aim.h          |  6 +++---
 include/aim_internal.h |  2 +-
 src/admin.c            |  4 ++--
 src/auth.c             |  4 ++--
 src/bos.c              |  2 +-
 src/buddylist.c        |  4 ++--
 src/chat.c             |  6 +++---
 src/chatnav.c          |  4 ++--
 src/conn.c             |  2 +-
 src/ft.c               |  4 ++--
 src/im.c               | 12 ++++++------
 src/info.c             |  4 ++--
 src/login.c            | 18 +++++++++---------
 src/misc.c             |  4 ++--
 src/rxhandlers.c       | 22 +++++++++++-----------
 src/search.c           |  4 ++--
 src/stats.c            |  2 +-
 18 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/CHANGES b/CHANGES
index e408a1c..ce1a3c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
 No release numbers
 ------------------
+ - Mon May  7 15:19:55 PDT 2001
+  - Rename rxhandler_t to aim_rxhandler_t.  This has been 
+     bugging me for a while.
+
  - Thu May  3 15:47:23 PDT 2001
   - Clean up getcap/putcaps
   - Add GAMES2 and SENDBUDDYLIST caps (the latter is new in winaim 4.7beta)
diff --git a/include/aim.h b/include/aim.h
index bd5443c..244e4b3 100644
--- a/include/aim.h
+++ b/include/aim.h
@@ -474,7 +474,7 @@ faim_export int aim_logoff(struct aim_session_t *);
 faim_export void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn);
 #endif /* ndef FAIM_INTERNAL */
 
-typedef int (*rxcallback_t)(struct aim_session_t *, struct command_rx_struct *, ...);
+typedef int (*aim_rxcallback_t)(struct aim_session_t *, struct command_rx_struct *, ...);
 
 /* aim_login.c */
 faim_export int aim_sendconnack(struct aim_session_t *sess, struct aim_conn_t *conn);
@@ -498,14 +498,14 @@ faim_export void aim_tx_purgequeue(struct aim_session_t *);
 struct aim_rxcblist_t {
   u_short family;
   u_short type;
-  rxcallback_t handler;
+  aim_rxcallback_t handler;
   u_short flags;
   struct aim_rxcblist_t *next;
 };
 
 faim_export int aim_conn_setlatency(struct aim_conn_t *conn, int newval);
 
-faim_export int aim_conn_addhandler(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short type, rxcallback_t newhandler, u_short flags);
+faim_export int aim_conn_addhandler(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short type, aim_rxcallback_t newhandler, u_short flags);
 faim_export int aim_clearhandlers(struct aim_conn_t *conn);
 
 faim_export void aim_conn_close(struct aim_conn_t *deadconn);
diff --git a/include/aim_internal.h b/include/aim_internal.h
index 1c58e30..2ea2264 100644
--- a/include/aim_internal.h
+++ b/include/aim_internal.h
@@ -60,7 +60,7 @@ faim_internal int aim_tx_enqueue(struct aim_session_t *, struct command_tx_struc
 faim_internal int aim_tx_printqueue(struct aim_session_t *);
 faim_internal int aim_tx_cleanqueue(struct aim_session_t *, struct aim_conn_t *);
 
-faim_internal rxcallback_t aim_callhandler(struct aim_session_t *sess, struct aim_conn_t *conn, u_short family, u_short type);
+faim_internal aim_rxcallback_t aim_callhandler(struct aim_session_t *sess, struct aim_conn_t *conn, u_short family, u_short type);
 
 /*
  * Generic SNAC structure.  Rarely if ever used.
diff --git a/src/admin.c b/src/admin.c
index 759d096..4a461b6 100644
--- a/src/admin.c
+++ b/src/admin.c
@@ -24,7 +24,7 @@ static int infochange(struct aim_session_t *sess, aim_module_t *mod, struct comm
     i += 2;
 
     while (tlvcount) {
-      rxcallback_t userfunc;
+      aim_rxcallback_t userfunc;
       struct aim_tlv_t *tlv;
       int str = 0;
 
@@ -58,7 +58,7 @@ static int infochange(struct aim_session_t *sess, aim_module_t *mod, struct comm
 
 static int accountconfirm(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 status;
 
   status = aimutil_get16(data);
diff --git a/src/auth.c b/src/auth.c
index ba506ae..6db41c4 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -43,7 +43,7 @@ static int parse(struct aim_session_t *sess, aim_module_t *mod, struct command_r
 {
   struct aim_tlvlist_t *tlvlist;
   int ret = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   char *sn = NULL, *bosip = NULL, *errurl = NULL, *email = NULL;
   unsigned char *cookie = NULL;
   int errorcode = 0, regstatus = 0;
@@ -184,7 +184,7 @@ static int keyparse(struct aim_session_t *sess, aim_module_t *mod, struct comman
   unsigned char *key;
   int keylen;
   int ret = 1;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   keylen = aimutil_get16(data);
   if (!(key = malloc(keylen+1)))
diff --git a/src/bos.c b/src/bos.c
index 9a6a0de..8d6810b 100644
--- a/src/bos.c
+++ b/src/bos.c
@@ -21,7 +21,7 @@ faim_export unsigned long aim_bos_setgroupperm(struct aim_session_t *sess,
 
 static int rights(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;
   struct aim_tlvlist_t *tlvlist;
   unsigned short maxpermits = 0, maxdenies = 0;
diff --git a/src/buddylist.c b/src/buddylist.c
index 2c64a9b..cebcb6f 100644
--- a/src/buddylist.c
+++ b/src/buddylist.c
@@ -14,7 +14,7 @@
 static int buddychange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_userinfo_s userinfo;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   aim_extractuserinfo(sess, data, &userinfo);
 
@@ -26,7 +26,7 @@ static int buddychange(struct aim_session_t *sess, aim_module_t *mod, struct com
 
 static int rights(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;
   struct aim_tlvlist_t *tlvlist;
   unsigned short maxbuddies = 0, maxwatchers = 0;
   int ret = 0;
diff --git a/src/chat.c b/src/chat.c
index 05f421f..91edf0e 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -402,7 +402,7 @@ faim_export unsigned long aim_chat_invite(struct aim_session_t *sess,
 static int infoupdate(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_userinfo_s *userinfo = NULL;
-  rxcallback_t userfunc=NULL;	
+  aim_rxcallback_t userfunc=NULL;	
   int ret = 0, i = 0;
   int usercount = 0;
   unsigned char detaillevel = 0;
@@ -530,7 +530,7 @@ static int infoupdate(struct aim_session_t *sess, aim_module_t *mod, struct comm
 static int userlistchange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_userinfo_s *userinfo = NULL;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int i = 0, curcount = 0, ret = 0;
 
   while (i < datalen) {
@@ -573,7 +573,7 @@ static int userlistchange(struct aim_session_t *sess, aim_module_t *mod, struct
 static int incomingmsg(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_userinfo_s userinfo;
-  rxcallback_t userfunc=NULL;	
+  aim_rxcallback_t userfunc=NULL;	
   int ret = 0, i = 0;
   unsigned char cookie[8];
   int channel;
diff --git a/src/chatnav.c b/src/chatnav.c
index f057eae..8eaa648 100644
--- a/src/chatnav.c
+++ b/src/chatnav.c
@@ -94,7 +94,7 @@ faim_export unsigned long aim_chatnav_createroom(struct aim_session_t *sess,
 
 static int parseinfo_perms(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen, struct aim_snac_t *snac2)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int ret = 0;
   struct aim_tlvlist_t *tlvlist;
   struct aim_chat_exchangeinfo *exchanges = NULL;
@@ -258,7 +258,7 @@ static int parseinfo_perms(struct aim_session_t *sess, aim_module_t *mod, struct
 
 static int parseinfo_create(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen, struct aim_snac_t *snac2)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist, *innerlist;
   char *ck = NULL, *fqcn = NULL, *name = NULL;
   unsigned short exchange = 0, instance = 0, unknown = 0, flags = 0, maxmsglen = 0, maxoccupancy = 0;
diff --git a/src/conn.c b/src/conn.c
index f9f211c..0b5644b 100644
--- a/src/conn.c
+++ b/src/conn.c
@@ -848,7 +848,7 @@ faim_export int aim_conn_completeconnect(struct aim_session_t *sess, struct aim_
   fd_set fds, wfds;
   struct timeval tv;
   int res, error = ETIMEDOUT;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   if (!conn || (conn->fd == -1))
     return -1;
diff --git a/src/ft.c b/src/ft.c
index db50304..c9f4a9b 100644
--- a/src/ft.c
+++ b/src/ft.c
@@ -37,7 +37,7 @@ static struct aim_fileheader_t *aim_oft_getfh(unsigned char *hdr);
 faim_export int aim_handlerendconnect(struct aim_session_t *sess, struct aim_conn_t *cur)
 { 
   int acceptfd = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct sockaddr cliaddr;
   int clilen = sizeof(cliaddr);
   int ret = 0;
@@ -824,7 +824,7 @@ faim_internal int aim_get_command_rendezvous(struct aim_session_t *sess, struct
   unsigned char *hdr = NULL;
   int hdrlen, hdrtype;
   int flags = 0;
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   
   if (!sess || !conn || !conn->priv)
     return -1;
diff --git a/src/im.c b/src/im.c
index 52ce413..0f2fbe7 100644
--- a/src/im.c
+++ b/src/im.c
@@ -188,7 +188,7 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_con
 static int outgoingim(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   unsigned int i, ret = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   unsigned char cookie[8];
   int channel;
   struct aim_tlvlist_t *tlvlist;
@@ -252,7 +252,7 @@ static int outgoingim(struct aim_session_t *sess, aim_module_t *mod, struct comm
 
 static int incomingim_ch1(struct aim_session_t *sess, aim_module_t *mod,  struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, struct aim_tlvlist_t *tlvlist, unsigned char *cookie)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int i, j = 0, y = 0, z = 0, ret = 0;
   char *msg = NULL;
   unsigned long icbmflags = 0;
@@ -353,7 +353,7 @@ static int incomingim_ch1(struct aim_session_t *sess, aim_module_t *mod,  struct
 
 static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, struct aim_tlvlist_t *tlvlist, unsigned char *cookie)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlv_t *block1;
   struct aim_tlvlist_t *list2;
   unsigned short reqclass = 0;
@@ -804,7 +804,7 @@ static int paraminfo(struct aim_session_t *sess, aim_module_t *mod, struct comma
 {
   unsigned long defflags, minmsginterval;
   unsigned short maxicbmlen, maxsenderwarn, maxrecverwarn, maxchannel;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int i = 0;
 
   maxchannel = aimutil_get16(data+i);
@@ -834,7 +834,7 @@ static int paraminfo(struct aim_session_t *sess, aim_module_t *mod, struct comma
 static int missedcall(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   int i = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   unsigned short channel, nummissed, reason;
   struct aim_userinfo_s userinfo;
  
@@ -868,7 +868,7 @@ static int missedcall(struct aim_session_t *sess, aim_module_t *mod, struct comm
 
 static int msgack(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 sn[MAXSNLEN];
   unsigned char ck[8];
   unsigned short type;
diff --git a/src/info.c b/src/info.c
index ad24861..74358c8 100644
--- a/src/info.c
+++ b/src/info.c
@@ -542,7 +542,7 @@ faim_export int aim_0002_000b(struct aim_session_t *sess, struct aim_conn_t *con
 static int rights(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_tlvlist_t *tlvlist;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   int ret = 0;
 
   tlvlist = aim_readtlvchain(data, datalen);
@@ -561,7 +561,7 @@ static int userinfo(struct aim_session_t *sess, aim_module_t *mod, struct comman
   char *text_encoding = NULL;
   char *text = NULL;
   int i = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist;
   struct aim_snac_t *origsnac = NULL;
   struct aim_priv_inforeq *inforeq;
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;
diff --git a/src/misc.c b/src/misc.c
index 29f736f..bbc0538 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -830,7 +830,7 @@ static int generror(struct aim_session_t *sess, aim_module_t *mod, struct comman
 {
   int ret = 0;
   int error = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_snac_t *snac2;
 
   snac2 = aim_remsnac(sess, snac->id);
@@ -854,7 +854,7 @@ static int snachandler(struct aim_session_t *sess, aim_module_t *mod, struct com
   if (snac->subtype == 0x0001)
     return generror(sess, mod, rx, snac, data, datalen);
   else if ((snac->family == 0xffff) && (snac->subtype == 0xffff)) {
-    rxcallback_t userfunc;
+    aim_rxcallback_t userfunc;
 
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
       return userfunc(sess, rx);
diff --git a/src/rxhandlers.c b/src/rxhandlers.c
index 2f897da..19baded 100644
--- a/src/rxhandlers.c
+++ b/src/rxhandlers.c
@@ -295,11 +295,11 @@ faim_internal int bleck(struct aim_session_t *sess,struct command_rx_struct *wor
 }
 
 faim_export int aim_conn_addhandler(struct aim_session_t *sess,
-			struct aim_conn_t *conn,
-			u_short family,
-			u_short type,
-			rxcallback_t newhandler,
-			u_short flags)
+				    struct aim_conn_t *conn,
+				    u_short family,
+				    u_short type,
+				    aim_rxcallback_t newhandler,
+				    u_short flags)
 {
   struct aim_rxcblist_t *newcb;
 
@@ -353,10 +353,10 @@ faim_export int aim_clearhandlers(struct aim_conn_t *conn)
  return 0;
 }
 
-faim_internal rxcallback_t aim_callhandler(struct aim_session_t *sess,
-					   struct aim_conn_t *conn,
-					   unsigned short family,
-					   unsigned short type)
+faim_internal aim_rxcallback_t aim_callhandler(struct aim_session_t *sess,
+					       struct aim_conn_t *conn,
+					       unsigned short family,
+					       unsigned short type)
 {
   struct aim_rxcblist_t *cur;
 
@@ -386,7 +386,7 @@ faim_internal int aim_callhandler_noparam(struct aim_session_t *sess,
 					  u_short type,
 					  struct command_rx_struct *ptr)
 {
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   userfunc = aim_callhandler(sess, conn, family, type);
   if (userfunc)
     return userfunc(sess, ptr);
@@ -541,7 +541,7 @@ faim_internal int aim_negchan_middle(struct aim_session_t *sess,
   struct aim_tlvlist_t *tlvlist;
   char *msg = NULL;
   unsigned short code = 0;
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   int ret = 1;
 
   /* Used only by the older login protocol */
diff --git a/src/search.c b/src/search.c
index 5b080dd..0a59662 100644
--- a/src/search.c
+++ b/src/search.c
@@ -38,7 +38,7 @@ faim_export unsigned long aim_usersearch_address(struct aim_session_t *sess,
 static int error(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   int ret = 0;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_snac_t *snac2;
 
   /* XXX the modules interface should have already retrieved this for us */
@@ -65,7 +65,7 @@ static int reply(struct aim_session_t *sess, aim_module_t *mod, struct command_r
   unsigned int j, m, ret = 0;
   struct aim_tlvlist_t *tlvlist;
   char *cur = NULL, *buf = NULL;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_snac_t *snac2;
 
   if (!(snac2 = aim_remsnac(sess, snac->id))) {
diff --git a/src/stats.c b/src/stats.c
index 65dd009..523305c 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -5,7 +5,7 @@
 static int reportinterval(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   unsigned short interval;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   interval = aimutil_get16(data);
 
-- 
2.45.1