From b07d0db82b135d5c6852581d60e305e605b4f614 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 24 Dec 2010 09:11:23 +0000
Subject: [PATCH] (trunk daemon) #3836 "libevent2 support" -- fix libevent
 #includes in the daemon/ directory

---
 daemon/daemon.c | 2 +-
 daemon/remote.c | 6 +++---
 daemon/watch.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 111ba1674..d7467ffb2 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -25,7 +25,7 @@
 #endif
 #include <unistd.h> /* daemon */
 
-#include <event.h>
+#include <event2/buffer.h>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
diff --git a/daemon/remote.c b/daemon/remote.c
index a8a579086..c08fea966 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -24,7 +24,7 @@
  #include <unistd.h> /* getcwd */
 #endif
 
-#include <event.h>
+#include <event2/buffer.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>
@@ -1723,7 +1723,7 @@ flush( const char * rpcurl, tr_benc ** benc )
         curl_easy_getinfo( curl, CURLINFO_RESPONSE_CODE, &response );
         switch( response ) {
             case 200:
-                status |= processResponse( rpcurl, EVBUFFER_DATA(buf), EVBUFFER_LENGTH(buf) );
+                status |= processResponse( rpcurl, (const char*) evbuffer_pullup( buf, -1 ), evbuffer_get_length( buf ) );
                 break;
             case 409:
                 /* session id failed.  our curl header func has already
@@ -1735,7 +1735,7 @@ flush( const char * rpcurl, tr_benc ** benc )
                 benc = NULL;
                 break;
             default:
-                fprintf( stderr, "Unexpected response: %s\n", (char*)EVBUFFER_DATA(buf) );
+                fprintf( stderr, "Unexpected response: %s\n", evbuffer_pullup( buf, -1 ) );
                 status |= EXIT_FAILURE;
                 break;
         }
diff --git a/daemon/watch.c b/daemon/watch.c
index 0ccd02602..3e8c6dad4 100644
--- a/daemon/watch.c
+++ b/daemon/watch.c
@@ -16,7 +16,7 @@
 #else
   #include <sys/types.h> /* stat */
   #include <sys/stat.h> /* stat */
-  #include <event.h> /* evbuffer */
+  #include <event2/buffer.h> /* evbuffer */
 #endif
 
 #include <errno.h>