Merge branch 'v0.10'
Conflicts: test/test-spawn.c
This commit is contained in:
commit
118a0a3c9b
@ -383,10 +383,10 @@ int uv_fs_event_stop(uv_fs_event_t* handle) {
|
||||
|
||||
#if defined(__APPLE__)
|
||||
if (uv__fsevents_close(handle))
|
||||
uv__io_stop(handle->loop, &handle->event_watcher, UV__POLLIN);
|
||||
#else
|
||||
uv__io_stop(handle->loop, &handle->event_watcher, UV__POLLIN);
|
||||
#endif /* defined(__APPLE__) */
|
||||
{
|
||||
uv__io_close(handle->loop, &handle->event_watcher);
|
||||
}
|
||||
|
||||
free(handle->path);
|
||||
handle->path = NULL;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user