Merge branch 'master' into smgmaster

Conflicts:
	src/switch_console.c
This commit is contained in:
Moises Silva
2011-05-22 17:53:14 -04:00
296 changed files with 11586 additions and 7566 deletions
+2 -2
View File
@@ -793,10 +793,10 @@ int main(int argc, char *argv[])
#if defined(HAVE_SETRLIMIT) && !defined(__sun)
if (!waste && !(flags & SCF_VG)) {
int x;
//int x;
memset(&rlp, 0, sizeof(rlp));
x = getrlimit(RLIMIT_STACK, &rlp);
getrlimit(RLIMIT_STACK, &rlp);
if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) {
char buf[1024] = "";