Merge branch 'test' into demo

Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-06-01 16:47:09 -07:00
commit e54b7f8d89

2
n/m.c
View File

@ -1372,7 +1372,7 @@ _cm_limits(void)
ret_i = getrlimit(RLIMIT_NOFILE, &rlm); ret_i = getrlimit(RLIMIT_NOFILE, &rlm);
c3_assert(0 == ret_i); c3_assert(0 == ret_i);
rlm.rlim_cur = 10240; // default OSX max, not in rlim_max irritatingly rlm.rlim_cur = 10240; // default OSX max, not in rlim_max irritatingly
printf("files: %llu\n", rlm.rlim_cur); printf("files: %llu\n", (long long unsigned) rlm.rlim_cur);
if ( 0 != setrlimit(RLIMIT_NOFILE, &rlm) ) { if ( 0 != setrlimit(RLIMIT_NOFILE, &rlm) ) {
perror("file limit"); perror("file limit");
// no exit, not a critical limit // no exit, not a critical limit