aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/oscar/aim.h
diff options
context:
space:
mode:
authordequis <dx@dxzone.com.ar>2015-12-18 14:54:40 -0300
committerdequis <dx@dxzone.com.ar>2015-12-18 14:54:40 -0300
commitf66425d4030abddd9021789b21fbce109de8743e (patch)
tree5a0afc173672d2d0f4659bc517ea5c0a7b2b84aa /protocols/oscar/aim.h
parentea39049f995fb01987a3556520639fefb3bb79a7 (diff)
oscar: Add prefixes to all functions that may conflict with purple
When people build with ./configure --purple=1 --oscar=1, the native oscar is compiled statically, which should take priority, but sometimes purple's oscar is used instead and bad things happen, most of it being due to calling bitlbee's native aim_callhandler instead of the function with the same name of libpurple's liboscar.so.
Diffstat (limited to 'protocols/oscar/aim.h')
-rw-r--r--protocols/oscar/aim.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/protocols/oscar/aim.h b/protocols/oscar/aim.h
index 3b6b3925..fa1f884e 100644
--- a/protocols/oscar/aim.h
+++ b/protocols/oscar/aim.h
@@ -21,6 +21,11 @@
#include "bitlbee.h"
+#ifdef WITH_PURPLE
+/* For compatibility with builds that include both purple and this oscar module */
+#include "aim_prefixes.h"
+#endif
+
/* XXX adjust these based on autoconf-detected platform */
typedef guint32 aim_snacid_t;
typedef guint16 flap_seqnum_t;