Permalink
Browse files

Merge branch 'v0.10'

Conflicts:
	test/test-spawn.c
  • Loading branch information...
2 parents b197515 + 9b38c01 commit 118a0a3c9b051d0d7bcc52832c0b305acca744eb @indutny indutny committed Mar 10, 2014
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/unix/kqueue.c
View
@@ -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;

0 comments on commit 118a0a3

Please sign in to comment.