Changeset f66425d

Timestamp:

2015-12-18T17:54:40Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

98d46d5

Parents:

ea39049

Message:

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.

Location:

protocols/oscar

Files:

• aim.h (modified) (1 diff)
• aim_prefixes.h (added)

protocols/oscar/aim.h

@@ -21 +21 @@
 
 #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 */