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

Comparing libev/ev.c (file contents):
Revision 1.431 by root, Wed May 9 16:51:33 2012 UTC vs.
Revision 1.433 by root, Tue May 15 13:03:20 2012 UTC

1910 { 1910 {
1911 char dummy[4]; 1911 char dummy[4];
1912#ifdef _WIN32 1912#ifdef _WIN32
1913 WSABUF buf; 1913 WSABUF buf;
1914 DWORD recvd; 1914 DWORD recvd;
1915 DWORD flags = 0;
1915 buf.buf = dummy; 1916 buf.buf = dummy;
1916 buf.len = sizeof (dummy); 1917 buf.len = sizeof (dummy);
1917 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 1918 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1918#else 1919#else
1919 read (evpipe [0], &dummy, sizeof (dummy)); 1920 read (evpipe [0], &dummy, sizeof (dummy));
1920#endif 1921#endif
1921 } 1922 }
1922 } 1923 }
2354 EV_INVOKE_PENDING; 2355 EV_INVOKE_PENDING;
2355 } 2356 }
2356#endif 2357#endif
2357 2358
2358#if EV_CHILD_ENABLE 2359#if EV_CHILD_ENABLE
2359 if (ev_is_active (&childev)) 2360 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2360 { 2361 {
2361 ev_ref (EV_A); /* child watcher */ 2362 ev_ref (EV_A); /* child watcher */
2362 ev_signal_stop (EV_A_ &childev); 2363 ev_signal_stop (EV_A_ &childev);
2363 } 2364 }
2364#endif 2365#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines