Changeset 0b9daac for protocols/oscar

Timestamp:

2015-02-20T23:16:08Z (10 years ago)

Author:

dequis <dx@…>

Parents:

5ebff60

git-author:

dequis <dx@…> (27-12-14 04:06:45)

git-committer:

dequis <dx@…> (20-02-15 23:16:08)

Message:

Reorganize include files to avoid conflicts with other libs

• Change all header includes to be relative to the project root
• Remove -I${includedir} from bitlbee.pc Cflags
• Install lib and protocols headers to their own directories. So now it is:

/usr/include/bitlbee/*.h
/usr/include/bitlbee/lib/*.h
/usr/include/bitlbee/protocols/*.h

This breaks backwards compatibility of third party plugins, but now
they don't have to do ambiguous includes like #include <proxy.h>

This also fixes trac ticket 1170 - conflicts when libproxy and liboauth
are installed at the same time bitlbee is built, which the macports
project ran into several times.

Location:

protocols/oscar

Files:

• admin.c (modified) (1 diff)
• aim.h (modified) (1 diff)
• auth.c (modified) (1 diff)
• bos.c (modified) (1 diff)
• buddylist.c (modified) (1 diff)
• chat.c (modified) (1 diff)
• chatnav.c (modified) (1 diff)
• conn.c (modified) (1 diff)
• icq.c (modified) (1 diff)
• im.c (modified) (1 diff)
• info.c (modified) (1 diff)
• misc.c (modified) (1 diff)
• msgcookie.c (modified) (1 diff)
• oscar.c (modified) (1 diff)
• oscar_util.c (modified) (1 diff)
• rxhandlers.c (modified) (1 diff)
• rxqueue.c (modified) (1 diff)
• search.c (modified) (1 diff)
• service.c (modified) (1 diff)
• snac.c (modified) (1 diff)
• ssi.c (modified) (1 diff)
• stats.c (modified) (1 diff)
• tlv.c (modified) (1 diff)
• txqueue.c (modified) (1 diff)

protocols/oscar/admin.c

@@ -1 @@
-#include <aim.h>
+#include "aim.h"
 #include "admin.h"
 

protocols/oscar/aim.h

@@ -792 +792 @@
 int aim_sncmp(const char *a, const char *b);
 
-#include <aim_internal.h>
+#include "aim_internal.h"
 
 /*

protocols/oscar/auth.c

@@ -4 +4 @@
  */
 
-#include <aim.h>
-
-#include "md5.h"
+#include "aim.h"
+
+#include "lib/md5.h"
 
 static int aim_encode_password(const char *password, unsigned char *encoded);

protocols/oscar/bos.c

@@ -1 @@
-#include <aim.h>
+#include "aim.h"
 #include "bos.h"
 

protocols/oscar/buddylist.c

@@ -1 @@
-#include <aim.h>
+#include "aim.h"
 #include "buddylist.h"
 

protocols/oscar/chat.c

@@ -6 +6 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include <glib.h>
 #include "info.h"

protocols/oscar/chatnav.c

@@ -8 +8 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "chatnav.h"
 

protocols/oscar/conn.c

@@ -7 +7 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "sock.h"
 

protocols/oscar/icq.c

@@ -4 +4 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "icq.h"
 

protocols/oscar/im.c

@@ -20 +20 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "im.h"
 #include "info.h"

protocols/oscar/info.c

@@ -7 +7 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "info.h"
 

protocols/oscar/misc.c

@@ -12 +12 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 
 /*

protocols/oscar/msgcookie.c

@@ -12 +12 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "info.h"
 

protocols/oscar/oscar.c

@@ -31 +31 @@
 #include <sys/stat.h>
 #include <glib.h>
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "bitlbee.h"
-#include "proxy.h"
+#include "lib/proxy.h"
 #include "sock.h"
 

protocols/oscar/oscar_util.c

@@ -1 @@
-#include <aim.h>
+#include "aim.h"
 #include <ctype.h>
 

protocols/oscar/rxhandlers.c

@@ -8 +8 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 
 struct aim_rxcblist_s {

protocols/oscar/rxqueue.c

@@ -7 +7 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 
 #include <sys/socket.h>

protocols/oscar/search.c

@@ -7 +7 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 
 /* XXX can this be integrated with the rest of the error handling? */

protocols/oscar/service.c

@@ -4 +4 @@
  */
 
-#include <aim.h>
-
-#include "md5.h"
+#include "aim.h"
+
+#include "lib/md5.h"
 
 /* Client Online (group 1, subtype 2) */

protocols/oscar/snac.c

@@ -13 +13 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 
 static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);

protocols/oscar/ssi.c

@@ -23 +23 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "ssi.h"
 

protocols/oscar/stats.c

@@ -1 +1 @@
 
-#include <aim.h>
+#include "aim.h"
 
 static int reportinterval(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac,

protocols/oscar/tlv.c

@@ -1 @@
-#include <aim.h>
+#include "aim.h"
 
 static void freetlv(aim_tlv_t **oldtlv)

protocols/oscar/txqueue.c

@@ -6 +6 @@
  */
 
-#include <aim.h>
+#include "aim.h"
 #include "im.h"