Mercurial > pidgin.yaz
changeset 464:4966003f2c9b
[gaim-migrate @ 474]
Patch accepted from Josh Huber regarding compile errors on PPC and ARM.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Thu, 06 Jul 2000 17:22:32 +0000 |
| parents | be7cf1868b76 |
| children | ff1929d18ba3 |
| files | ChangeLog src/oscar.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 06 00:02:24 2000 +0000 +++ b/ChangeLog Thu Jul 06 17:22:32 2000 +0000 @@ -14,6 +14,7 @@ when you have a large buddylist. * Dialog windows are now prettier * Fixed the LC_ALL compile problem on Solaris boxes + * Fixed PPC and ARM compile problem with oscar.c version 0.9.19 (06/09/2000): * Graphical Smiley Faces
--- a/src/oscar.c Thu Jul 06 00:02:24 2000 +0000 +++ b/src/oscar.c Thu Jul 06 17:22:32 2000 +0000 @@ -534,8 +534,8 @@ userinfo = va_arg(ap, struct aim_userinfo_s *); msg = va_arg(ap, char *); icbmflags = va_arg(ap, u_int); - flag1 = va_arg(ap, u_short); - flag2 = va_arg(ap, u_short); + flag1 = (u_short)va_arg(ap, u_int); + flag2 = (u_short)va_arg(ap, u_int); va_end(ap); serv_got_im(userinfo->sn, msg, icbmflags & AIM_IMFLAGS_AWAY); @@ -624,7 +624,7 @@ info = va_arg(ap, struct aim_userinfo_s *); prof_enc = va_arg(ap, char *); prof = va_arg(ap, char *); - infotype = va_arg(ap, u_short); + infotype = (u_short)va_arg(ap, u_int); va_end(ap); if (prof == NULL || !strlen(prof)) { @@ -655,7 +655,7 @@ va_list ap; va_start(ap, command); - id = va_arg(ap, u_short); + id = (u_short)va_arg(ap, u_int); msg = va_arg(ap, char *); va_end(ap); @@ -674,7 +674,7 @@ u_short type; va_start(ap, command); - type = va_arg(ap, u_short); + type = (u_short)va_arg(ap, u_int); switch(type) { case 0x0002: {