Merge branch '20_internal_prio'
authorNick Mathewson <nickm@torproject.org>
Sat, 9 Oct 2010 04:02:31 +0000 (00:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 9 Oct 2010 04:02:31 +0000 (00:02 -0400)
1  2 
event.c
signal.c

diff --cc event.c
Simple merge
diff --cc signal.c
index 9a5c868f0afa99446a6d3c1ceed2b81a58b4ecb9,86361cce6c86105ef6c10428fc7b1479d9c4a22c..f840e259c24d7951f255129de9397bf95ac37d46
+++ b/signal.c
@@@ -199,11 -133,13 +199,12 @@@ evsig_init(struct event_base *base
        evutil_make_socket_nonblocking(base->sig.ev_signal_pair[1]);
  
        event_assign(&base->sig.ev_signal, base, base->sig.ev_signal_pair[1],
 -              EV_READ | EV_PERSIST, evsig_cb, &base->sig.ev_signal);
 +              EV_READ | EV_PERSIST, evsig_cb, base);
  
        base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
+       event_priority_set(&base->sig.ev_signal, 0);
  
        base->evsigsel = &evsigops;
 -      base->evsigbase = &base->sig;
  
        return 0;
  }