Automatic merge

3 files changed, 4 insertions, 3 deletions

diff --git a/extra/libevent/evbuffer.c b/extra/libevent/evbuffer.c
index 6fe791380ea..432d75d1c53 100644
--- a/extra/libevent/evbuffer.c
+++ b/extra/libevent/evbuffer.c
@@ -75,7 +75,7 @@ bufferevent_add(struct event *ev, int timeout)
  */
 
 void
-bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now,
+bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old __attribute__((unused)), size_t now,
     void *arg) {
 	struct bufferevent *bufev = arg;
 	/* 
diff --git a/extra/libevent/event.c b/extra/libevent/event.c
index e96c1b6a3ab..2042c2de626 100644
--- a/extra/libevent/event.c
+++ b/extra/libevent/event.c
@@ -394,7 +394,8 @@ event_base_get_method(struct event_base *base)
 }
 
 static void
-event_loopexit_cb(int fd, short what, void *arg)
+event_loopexit_cb(int fd __attribute__((unused)),
+                  short what __attribute__((unused)), void *arg)
 {
 	struct event_base *base = arg;
 	base->event_gotterm = 1;
diff --git a/extra/libevent/signal.c b/extra/libevent/signal.c
index 964ae37fed2..5eb9d3c606e 100644
--- a/extra/libevent/signal.c
+++ b/extra/libevent/signal.c
@@ -69,7 +69,7 @@ static void evsignal_handler(int sig);
 
 /* Callback for when the signal handler write a byte to our signaling socket */
 static void
-evsignal_cb(int fd, short what, void *arg)
+evsignal_cb(int fd, short what __attribute__((unused)), void *arg __attribute__((unused)))
 {
 	static char signals[100];
 #ifdef WIN32