← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2789)

 

#At lp:maria

 2789 knielsen@xxxxxxxxxxxxxxx	2010-01-07
      Revert earlier change that removes warnings, but breaks Windows compilation.
      modified:
        extra/libevent/devpoll.c
        extra/libevent/evbuffer.c

=== modified file 'extra/libevent/devpoll.c'
--- a/extra/libevent/devpoll.c	2010-01-06 21:27:53 +0000
+++ b/extra/libevent/devpoll.c	2010-01-07 13:00:06 +0000
@@ -185,9 +185,7 @@ devpoll_init(struct event_base *base)
 }
 
 static int
-devpoll_recalc(struct event_base *base __attribute__((unused)),
-               void *arg __attribute__((unused)),
-               int max)
+devpoll_recalc(struct event_base *base, void *arg, int max)
 {
 	struct devpollop *devpollop = arg;
 

=== modified file 'extra/libevent/evbuffer.c'
--- a/extra/libevent/evbuffer.c	2010-01-06 21:27:53 +0000
+++ b/extra/libevent/evbuffer.c	2010-01-07 13:00:06 +0000
@@ -75,8 +75,7 @@ bufferevent_add(struct event *ev, int ti
  */
 
 void
-bufferevent_read_pressure_cb(struct evbuffer *buf,
-                             size_t old __attribute__((unused)), size_t now,
+bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now,
     void *arg) {
 	struct bufferevent *bufev = arg;
 	/*