Mercurial > pidgin.yaz
changeset 10035:4e7fe18a36b7
[gaim-migrate @ 10994]
Wait, didn't I already commit this?
It should make libfaim compile again with c++
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 18 Sep 2004 17:19:29 +0000 |
| parents | 343889b2f654 |
| children | 0ddc38f8db4a |
| files | src/protocols/oscar/aim.h src/protocols/oscar/conn.c src/protocols/oscar/im.c |
| diffstat | 3 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Fri Sep 17 22:44:12 2004 +0000 +++ b/src/protocols/oscar/aim.h Sat Sep 18 17:19:29 2004 +0000 @@ -79,10 +79,6 @@ #define TRUE (!FALSE) #endif -#ifndef bool -#define bool fu8_t -#endif - /* * Current Maximum Length for Screen Names (not including NULL) * @@ -432,7 +428,7 @@ char password[128]; } socksproxy; - bool nonblocking; + fu8_t nonblocking; int debug; void (*debugcb)(struct aim_session_s *sess, int level, const char *format, va_list va); /* same as faim_debugging_callback_t */ @@ -582,7 +578,7 @@ typedef void (*faim_debugging_callback_t)(aim_session_t *sess, int level, const char *format, va_list va); faim_export int aim_setdebuggingcb(aim_session_t *sess, faim_debugging_callback_t); -faim_export void aim_session_init(aim_session_t *, bool nonblocking, int debuglevel); +faim_export void aim_session_init(aim_session_t *, fu8_t nonblocking, int debuglevel); faim_export void aim_session_kill(aim_session_t *); faim_export void aim_setupproxy(aim_session_t *sess, const char *server, const char *username, const char *password); faim_export aim_conn_t *aim_getconn_type(aim_session_t *, int type); @@ -868,7 +864,7 @@ /* 0x0006 */ faim_export int aim_im_sendch2_chatinvite(aim_session_t *sess, const char *sn, const char *msg, fu16_t exchange, const char *roomname, fu16_t instance); /* 0x0006 */ faim_export int aim_im_sendch2_icon(aim_session_t *sess, const char *sn, const fu8_t *icon, int iconlen, time_t stamp, fu16_t iconsum); /* 0x0006 */ faim_export int aim_im_sendch2_rtfmsg(aim_session_t *sess, struct aim_sendrtfmsg_args *args); -/* 0x0006 */ faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, bool usecookie, const char *sn, const fu8_t *ip, fu16_t port); +/* 0x0006 */ faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, fu8_t usecookie, const char *sn, const fu8_t *ip, fu16_t port); /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_ask(aim_session_t *sess, struct aim_oft_info *oft_info); /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_accept(aim_session_t *sess, struct aim_oft_info *info); /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_cancel(aim_session_t *sess, struct aim_oft_info *oft_info);
--- a/src/protocols/oscar/conn.c Fri Sep 17 22:44:12 2004 +0000 +++ b/src/protocols/oscar/conn.c Sat Sep 18 17:19:29 2004 +0000 @@ -829,7 +829,7 @@ * @param nonblocking Set to true if you want connections to be non-blocking. * @param debuglevel Level of debugging output (zero is least). */ -faim_export void aim_session_init(aim_session_t *sess, bool nonblocking, int debuglevel) +faim_export void aim_session_init(aim_session_t *sess, fu8_t nonblocking, int debuglevel) { if (!sess)
--- a/src/protocols/oscar/im.c Fri Sep 17 22:44:12 2004 +0000 +++ b/src/protocols/oscar/im.c Sat Sep 18 17:19:29 2004 +0000 @@ -674,7 +674,7 @@ * Subtype 0x0006 - Send an "I want to directly connect to you" message * */ -faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, bool usecookie, const char *sn, const fu8_t *ip, fu16_t port) +faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, fu8_t usecookie, const char *sn, const fu8_t *ip, fu16_t port) { aim_conn_t *conn; aim_frame_t *fr;