# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1123038743 0
# Node ID 1ce573a2e125f62171c64cce7a8b200ab9e574b5
# Parent  044645e8a679cb67f2613421f49ccf572faa70da
[gaim-migrate @ 13297]
Meh

committer: Tailor Script <tailor@pidgin.im>

diff -r 044645e8a679 -r 1ce573a2e125 src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Wed Aug 03 02:59:39 2005 +0000
+++ b/src/protocols/oscar/aim.h	Wed Aug 03 03:12:23 2005 +0000
@@ -37,16 +37,13 @@
 extern "C" {
 #endif
 
-/* XXX adjust these based on autoconf-detected platform */
-typedef unsigned char fu8_t;
-typedef unsigned short fu16_t;
-typedef unsigned int fu32_t;
-typedef fu32_t aim_snacid_t;
-typedef fu16_t flap_seqnum_t;
+/* TODO: Remove these three typedefs and use guints everywhere. */
+typedef guint8  fu8_t;
+typedef guint16 fu16_t;
+typedef guint32 fu32_t;
 
-#if defined(mach) && defined(__APPLE__)
-#define gethostbyname(x) gethostbyname2(x, AF_INET) 
-#endif
+typedef guint32 aim_snacid_t;
+typedef guint16 flap_seqnum_t;
 
 #if defined(_WIN32) && !defined(WIN32_STATIC)
 /*
diff -r 044645e8a679 -r 1ce573a2e125 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Wed Aug 03 02:59:39 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Aug 03 03:12:23 2005 +0000
@@ -5625,7 +5625,7 @@
 
 		args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
 		if (od->icq) {
-						/* We have to present different "features" (whose meaning
+			/* We have to present different "features" (whose meaning
 			   is unclear and are merely a result of protocol inspection)
 			   to offline ICQ buddies. Otherwise, the official
 			   ICQ client doesn't treat those messages as being "ANSI-