diff options
author | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
commit | fcfe3f145944eb93270f8c4d301313364e1f30b2 (patch) | |
tree | 378d1e978b67c2c78904a81b454d303def969a97 /mcon/U/d_NOFILE.U | |
parent | e65bb46f249ce0cb16f71814f8b542eea87a8a82 (diff) | |
parent | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (diff) |
Merge branch 'upstream' into topic--debian
Conflicts:
jmake/files/Jmake.rules
mcon/U/Chk_MANI.U
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'mcon/U/d_NOFILE.U')
-rw-r--r-- | mcon/U/d_NOFILE.U | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mcon/U/d_NOFILE.U b/mcon/U/d_NOFILE.U index 45ebabd..7685cd1 100644 --- a/mcon/U/d_NOFILE.U +++ b/mcon/U/d_NOFILE.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_NOFILE.U,v 3.0.1.1 1994/10/29 16:08:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_NOFILE.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:08:38 ram @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:39 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:nofile d_gettblsz tablesize: Myread Guess libc cat +cc +ccflags +libs \ +?MAKE:nofile d_gettblsz tablesize: Myread Guess cat +cc +ccflags +libs \ test rm Csym ?MAKE: -pick add $@ %< ?S:nofile: @@ -58,13 +58,13 @@ if set getdtablesize val -f d_gettblsz; eval $csym; $val; then @if VAL_NOFILE || nofile $cat >nofile.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", getdtablesize()); } EOCP nofile='' - if $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1; then + if $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1; then nofile=`./nofile 2>/dev/null` fi if $test "$nofile"; then @@ -86,7 +86,7 @@ else #ifdef GETPARAM_H #include <sys/param.h> #endif -main() +int main() { printf("%d %d\n", #ifdef NOFILE @@ -98,8 +98,8 @@ main() exit(0); } EOCP - if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \ - || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then + if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \ + || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then set `./nofile` d_gettblsz=$1 d_ulimit4=$2 @@ -157,7 +157,7 @@ case "$nofile" in #ifdef GETPARAM_H #include <sys/param.h> #endif -main() +int main() { printf("%d\n", #ifdef NOFILE @@ -169,8 +169,8 @@ main() exit(0); } EOCP - if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \ - || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then + if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \ + || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then nofile=`./nofile 2>/dev/null` fi if $test "$nofile"; then |