Changeset 13329

Timestamp:

May 30, 2012, 5:47:29 PM (9 years ago)

Author:

jordan

Message:

(trunk libT) fix the Linux build wrt compiling with the new snapshot of libutp checked into r13317

Previously we made sure to include stdbool.h (via transmission.h) before utp.h, since the latter used 'bool' without defining it. The new snapshot defines it unconditionally in non-C++ code, so now we need to include it first.

Location:

trunk/libtransmission

Files:

• net.c (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• session.c (modified) (1 diff)
• tr-udp.c (modified) (1 diff)
• tr-utp.c (modified) (1 diff)
• tr-utp.h (modified) (1 diff)

trunk/libtransmission/net.c

@@ -39 +39 @@
 #include <event2/util.h>
 
+#include <libutp/utp.h>
+
 #include "transmission.h"
 #include "fdlimit.h" /* tr_fdSocketClose() */

trunk/libtransmission/peer-io.c

@@ -18 +18 @@
 #include <event2/buffer.h>
 #include <event2/bufferevent.h>
+
+#include <libutp/utp.h>
 
 #include "transmission.h"

trunk/libtransmission/peer-mgr.c

@@ -18 +18 @@
 
 #include <event2/event.h>
+
+#include <libutp/utp.h>
 
 #include "transmission.h"

trunk/libtransmission/session.c

@@ -24 +24 @@
 #include <event2/dns.h> /* evdns_base_free() */
 #include <event2/event.h>
+
+#include <libutp/utp.h>
 
 //#define TR_SHOW_DEPRECATED

trunk/libtransmission/tr-udp.c

@@ -29 +29 @@
 
 #include <event2/event.h>
+
+#include <libutp/utp.h>
 
 #include "transmission.h"

trunk/libtransmission/tr-utp.c

@@ -25 +25 @@
 
 #include <event2/event.h>
+
+#include <libutp/utp.h>
 
 #include "transmission.h"

trunk/libtransmission/tr-utp.h

@@ -29 +29 @@
 #define _TR_UTP_H_
 
-/* this is included *after* transmission.h s.t. we get bool defined */
-#include <libutp/utp.h>
-
 int tr_utpPacket(const unsigned char *buf, size_t buflen,
                  const struct sockaddr *from, socklen_t fromlen,