ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.14 by root, Sun Nov 4 19:45:09 2007 UTC vs.
Revision 1.17 by root, Sun Nov 4 23:14:11 2007 UTC

89 else 89 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
91#else 91#else
92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
93 93
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
95#endif 95#endif
96 96
97 return x_cur; 97 return x_cur;
98} 98}
99 99
223 { 223 {
224 /* sig */ 224 /* sig */
225 if (ev_is_active (&ev->iosig.sig)) 225 if (ev_is_active (&ev->iosig.sig))
226 ev_signal_stop (EV_A_ &ev->iosig.sig); 226 ev_signal_stop (EV_A_ &ev->iosig.sig);
227 } 227 }
228 else 228 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 229 {
230 /* io */ 230 /* io */
231 if (ev_is_active (&ev->iosig.io)) 231 if (ev_is_active (&ev->iosig.io))
232 ev_io_stop (EV_A_ &ev->iosig.io); 232 ev_io_stop (EV_A_ &ev->iosig.io);
233 } 233 }
248 { 248 {
249 /* sig */ 249 /* sig */
250 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 250 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
251 revents |= EV_SIGNAL; 251 revents |= EV_SIGNAL;
252 } 252 }
253 else 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 { 254 {
255 /* io */ 255 /* io */
256 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) 256 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
257 revents |= ev->ev_events & (EV_READ | EV_WRITE); 257 revents |= ev->ev_events & (EV_READ | EV_WRITE);
258 } 258 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines