mirror of
https://github.com/transmission/transmission
synced 2025-02-22 14:10:34 +00:00
(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.
This commit is contained in:
parent
695c048268
commit
d717248e75
7 changed files with 12 additions and 3 deletions
|
@ -38,6 +38,8 @@
|
|||
|
||||
#include <event2/util.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
#include "transmission.h"
|
||||
#include "fdlimit.h" /* tr_fdSocketClose() */
|
||||
#include "net.h"
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
#include <event2/buffer.h>
|
||||
#include <event2/bufferevent.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
#include "transmission.h"
|
||||
#include "session.h"
|
||||
#include "bandwidth.h"
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include <event2/event.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
#include "transmission.h"
|
||||
#include "announcer.h"
|
||||
#include "bandwidth.h"
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#include <event2/dns.h> /* evdns_base_free() */
|
||||
#include <event2/event.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
//#define TR_SHOW_DEPRECATED
|
||||
#include "transmission.h"
|
||||
#include "announcer.h"
|
||||
|
|
|
@ -29,6 +29,8 @@ THE SOFTWARE.
|
|||
|
||||
#include <event2/event.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
#include "transmission.h"
|
||||
#include "net.h"
|
||||
#include "session.h"
|
||||
|
|
|
@ -25,6 +25,8 @@ THE SOFTWARE.
|
|||
|
||||
#include <event2/event.h>
|
||||
|
||||
#include <libutp/utp.h>
|
||||
|
||||
#include "transmission.h"
|
||||
#include "net.h"
|
||||
#include "session.h"
|
||||
|
|
|
@ -28,9 +28,6 @@ THE SOFTWARE.
|
|||
#ifndef _TR_UTP_H_
|
||||
#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,
|
||||
tr_session *ss);
|
||||
|
|
Loading…
Reference in a new issue