Conflicts:
	v/unix.c
This commit is contained in:
vere 2014-11-12 19:57:45 +00:00
commit 9066a62638

View File

@ -1568,9 +1568,7 @@ u2_unix_io_poll(void)
}
else unx_u->alm = u2_yes;
if ( gap_d < 1000 ) {
gap_d = 1000;
}
if ( gap_d < 1000 ) { gap_d = 1000; } // band-aid on an unknown clay timer bug
uv_timer_start(&unx_u->tim_u, _unix_time_cb, gap_d, 0);
}
else {