diff src/protocols/oscar/aim.h @ 6322:dd2be7cd66df

[gaim-migrate @ 6821] This is: -Alphabetize the translation things in ChangeLog -Spell Brian Tarricone's name correctly (I hope...) -A fix for a crash when renaming a group containing a chat, thanks to javabsp. Me gusta this change. -Make the rename group dialog use gaim_request_input(). The old dialog may be a bit prettier, but this one uses the request code, which means less work for UIs, which rocks. -Change the TRUE and FALSE defines in aim.h to be more compatible with c++. Thanks to Zack Rusin for this change. -Declare aim.h as a C file when it is used in a c++ program. This should let libfaim be used in C++ programs such as kopete. Thanks again to Zack Rusin. -Rename aimutil_itemidx() to aimutil_itemindex(). "idx" is not a standard abbreviation, and code is written once and read many times--it should be easily readable. -Not an automatic laundry folding machine. So I'm going to do that. (Fold my laundry) (Not automatically) (yet) committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/aim.h	Tue Jul 29 02:27:33 2003 +0000
+++ b/src/protocols/oscar/aim.h	Tue Jul 29 04:27:31 2003 +0000
@@ -35,6 +35,10 @@
 #include <winsock.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* XXX adjust these based on autoconf-detected platform */
 typedef unsigned char fu8_t;
 typedef unsigned short fu16_t;
@@ -67,9 +71,12 @@
 #define faim_internal
 #endif
 
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
 #ifndef TRUE
-#define TRUE 1
-#define FALSE 0
+#define TRUE (!FALSE)
 #endif
 
 /* 
@@ -1433,11 +1440,15 @@
 faim_export int aim_util_getlocalip(fu8_t *ip);
 faim_export int aimutil_tokslen(char *toSearch, int index, char dl);
 faim_export int aimutil_itemcnt(char *toSearch, char dl);
-faim_export char *aimutil_itemidx(char *toSearch, int index, char dl);
+faim_export char *aimutil_itemindex(char *toSearch, int index, char dl);
 
 faim_export int aim_snlen(const char *sn);
 faim_export int aim_sncmp(const char *sn1, const char *sn2);
 
 #include <aim_internal.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __AIM_H__ */