(trunk libT) clean up #includes for event.h and evutil.h

diff --git a/libtransmission/bandwidth.c b/libtransmission/bandwidth.c
index fb391d8cfa6abf516be1f8ac31da4f9a48a5907a..229bf452694cf816705bd95f3b9555929de47eeb 100644 (file)
--- a/libtransmission/bandwidth.c
+++ b/libtransmission/bandwidth.c
@@ -13,8 +13,6 @@
 #include <assert.h>
 #include <limits.h>
 
-#include "event.h"
-
 #include "transmission.h"
 #include "bandwidth.h"
 #include "crypto.h"

diff --git a/libtransmission/bencode-test.c b/libtransmission/bencode-test.c
index bc5fe635996f2b711201ae5c026ad475ce0d9b97..d495297053789fd84a824719836d6410eb20502f 100644 (file)
--- a/libtransmission/bencode-test.c
+++ b/libtransmission/bencode-test.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "event.h"
+#include <event.h>
 
 #include "transmission.h"
 #include "bencode.h"

diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index d13e5966e07d3ce0f14df284074fa701e601ab1b..5164c06eda4582c32deba29bcdc4cf70364bd2c8 100644 (file)
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -9,14 +9,12 @@
  * $Id$
  */
 
-#include <stdlib.h> /* for abs() */
-#include <limits.h> /* for INT_MAX */
-#include <sys/types.h> /* for event.h, as well as netinet/in.h on some platforms
-                         */
 #include <assert.h>
 #include <inttypes.h> /* uint8_t */
-#include <string.h> /* memcpy */
+#include <limits.h> /* for INT_MAX */
 #include <stdarg.h>
+#include <stdlib.h> /* for abs() */
+#include <string.h> /* memcpy */
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -25,8 +23,6 @@
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 
-#include <event.h>
-
 #include "transmission.h"
 #include "crypto.h"
 #include "utils.h"

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 8f1cab52534ab0fcbe07a5ac9391706d1386aa89..e480eb20f32bf8d60ce21c2aa3c135ec720355d6 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -49,9 +49,6 @@
 #include <fcntl.h> /* O_LARGEFILE posix_fadvise */
 #include <unistd.h>
 
-#include <stdarg.h> /* some 1.4.x versions of evutil.h need this */
-#include <evutil.h>
-
 #include "transmission.h"
 #include "fdlimit.h"
 #include "net.h"

diff --git a/libtransmission/json.c b/libtransmission/json.c
index d86cd7a4f2bde36644fe2c867e6285f0eea28682..4d19c8065307c1c5ee5f4211c1c83dc0d0551bbc 100644 (file)
--- a/libtransmission/json.c
+++ b/libtransmission/json.c
@@ -16,8 +16,6 @@
 #include <string.h>
 #include <stdio.h> /* printf */
 
-#include <event.h> /* evbuffer */
-
 #include "JSON_parser.h"
 
 #include "transmission.h"

diff --git a/libtransmission/port-forwarding.c b/libtransmission/port-forwarding.c
index 935f990528260c6c517d32fc592fc19a64a904a7..599f6c2aa195f5fafaf07ea60b52fc6a70e1c003 100644 (file)
--- a/libtransmission/port-forwarding.c
+++ b/libtransmission/port-forwarding.c
@@ -16,6 +16,8 @@
 
 #include <sys/types.h>
 
+#include <event.h>
+
 #include "transmission.h"
 #include "natpmp.h"
 #include "net.h"

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 78dad937e743c04a89d855c7a5bcca66d2bdb958..8e8da49bc0e9839bfd18a4734ece5030b276ad85 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -22,7 +22,8 @@
 #include <string.h> /* memcmp */
 #include <stdlib.h> /* qsort */
 
-#include <event.h> /* evbuffer */
+#include <stdarg.h> /* some 1.4.x versions of evutil.h need this */
+#include <evutil.h> /* evutil_vsnprintf() */
 
 #include "transmission.h"
 #include "announcer.h"