Permalink
Browse files

Merge branch 'v0.6'

Conflicts:
	include/uv-private/uv-unix.h
	src/unix/core.c
	src/unix/stream.c
	src/unix/sunos.c
	src/unix/udp.c
  • Loading branch information...
2 parents ed2bc23 + d6a96de commit 0c7d9ab14951f138c9a47744bb82264f626cdbeb @piscisaureus piscisaureus committed Jul 31, 2012
Showing with 0 additions and 2 deletions.
  1. +0 −1 include/uv-private/uv-unix.h
  2. +0 −1 src/unix/ev/ev.c
@@ -296,7 +296,6 @@ struct uv__io_s {
#ifdef PORT_SOURCE_FILE
# define UV_FS_EVENT_PRIVATE_FIELDS \
- ev_io event_watcher; \
uv_fs_event_cb cb; \
file_obj_t fo; \
int fd;
View
@@ -2558,7 +2558,6 @@ void
ev_unref (EV_P)
{
--activecnt;
- if (activecnt < 0) abort();
}
void

0 comments on commit 0c7d9ab

Please sign in to comment.