Merge branch 'master' of github.com:urbit/urbit-new

This commit is contained in:
Galen Wolfe-Pauly 2015-04-08 11:46:14 -07:00
commit 4943ca19cf
3 changed files with 3 additions and 2 deletions

View File

@ -86,6 +86,7 @@ CWFLAGS=-Wall \
-Wno-sign-compare \
-Wno-unused-parameter \
-Wno-missing-field-initializers \
-Wno-error=unused-result \
-Wno-strict-aliasing \
-Werror
ifneq ($(OS),bsd)

View File

@ -104,7 +104,7 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav)
u3_unix_ef_init(u3k(p_fav));
// uL(fprintf(uH, "kick: init: %d\n", p_fav));
uL(fprintf(uH, "kick: init: %d\n", p_fav));
u3z(pox); u3z(fav); return c3y;
} break;
}

View File

@ -213,7 +213,7 @@ _unix_fs_event_cb(uv_fs_event_t* was_u,
c3_i evt_i,
c3_i sas_i)
{
// note that we're doing something tricky and weird here.
//
// * libuv passes around a pointer to a uv_fs_event_t