Merge branch 'vendor/TCSH'
authorSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Wed, 30 Sep 2009 13:50:00 +0000 (15:50 +0200)
committerSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Wed, 30 Sep 2009 13:50:00 +0000 (15:50 +0200)
1  2 
contrib/tcsh-6/ed.term.h
contrib/tcsh-6/sh.c
contrib/tcsh-6/sh.decls.h
contrib/tcsh-6/sh.func.c
contrib/tcsh-6/sh.set.c

Simple merge
Simple merge
Simple merge
@@@ -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            }
  };
  
Simple merge