From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Date: Wed, 30 Sep 2009 13:50:00 +0000 (+0200)
Subject: Merge branch 'vendor/TCSH'
X-Git-Tag: v2.5.1~42
X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain/45c6d8c4132b612b445b858c6ed1d930140bc840

Merge branch 'vendor/TCSH'
---

45c6d8c4132b612b445b858c6ed1d930140bc840
diff --cc contrib/tcsh-6/sh.func.c
index 682932331d,2e37af0814..a25dc2ae82
--- a/contrib/tcsh-6/sh.func.c
+++ b/contrib/tcsh-6/sh.func.c
@@@ -1795,9 -1932,11 +1932,15 @@@ struct limits limits[] 
  # ifdef RLIMIT_SBSIZE
      { RLIMIT_SBSIZE,	"sbsize",	1,	""		},
  # endif /* RLIMIT_SBSIZE */
+ 
 +#ifdef RLIMIT_POSIXLOCKS
 +    { RLIMIT_POSIXLOCKS, "posixlocks",   1,      ""		},
 +#endif /* RLIMIT_POSIXLOCKS */
++
+ # ifdef RLIMIT_SWAP 
+     { RLIMIT_SWAP,	"swapsize",	1024,	"kbytes"	}, 
+ # endif /* RLIMIT_SWAP */ 
+ 
      { -1, 		NULL, 		0, 	NULL		}
  };