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
joyent · Jul 31, 2012 · 0c7d9ab · 0c7d9ab
2 parents ed2bc23 + d6a96de
commit 0c7d9ab
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/include/uv-private/uv-unix.h b/include/uv-private/uv-unix.h
@@ -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;

diff --git a/src/unix/ev/ev.c b/src/unix/ev/ev.c
@@ -2558,7 +2558,6 @@ void
 ev_unref (EV_P)
 {
   --activecnt;
-  if (activecnt < 0) abort();
 }
 
 void