Merge branch 'upstream' into topic--debian

Conflicts:

	jmake/files/Jmake.rules
	mcon/U/Chk_MANI.U

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/mcon/U/d_stdstdio.U b/mcon/U/d_stdstdio.U
index 97c4cd0..b04acbc 100644
--- a/mcon/U/d_stdstdio.U
+++ b/mcon/U/d_stdstdio.U
@@ -1,12 +1,12 @@
-?RCS: $Id: d_stdstdio.U,v 3.0.1.3 1997/02/28 15:46:32 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: Original Author: Tye McQueen <tye@metronet.com>
 ?RCS:
@@ -145,7 +145,7 @@
 ?H:?d_stdiobase:#endif
 ?H:.
 ?W:d_stdiobase:FILE_base FILE_bufsiz
-?LINT:set d_stdstdio d_stdiobase d_stdio_ptr_lval d_stdio_cnt_lval
+?LINT:set d_stdstdio d_stdiobase
 ?T:ptr_lval cnt_lval filbuf xxx
 ?F:!try
 : see if _ptr and _cnt from stdio act std
@@ -196,7 +196,7 @@ $cat >try.c <<EOP
 #include <stdio.h>
 #define FILE_ptr(fp)	$stdio_ptr
 #define FILE_cnt(fp)	$stdio_cnt
-main() {
+int main() {
 	FILE *fp = fopen("try.c", "r");
 	char c = getc(fp);
 	if (
@@ -249,8 +249,8 @@ eval $setvar
 : If this fails, check how the getc macro in stdio.h works.
 case "${d_stdio_ptr_lval}${d_stdio_cnt_lval}" in
 ${define}${define})
-	: Try $hint value, if any, then _filbuf, __filbuf, _fill, then punt.
-	: _fill is for os/2.
+	: Try hint value, if any, then _filbuf, __filbuf, _fill, then punt.
+	: _fill is for OS/2.
 	xxx='notok'
 	for filbuf in $stdio_filbuf '_filbuf(fp)' '__filbuf(fp) ' '_fill(fp)' ; do
 		$cat >try.c <<EOP
@@ -258,7 +258,7 @@ ${define}${define})
 #define FILE_ptr(fp)	$stdio_ptr
 #define FILE_cnt(fp)	$stdio_cnt
 #define FILE_filbuf(fp)	$filbuf
-main() {
+int main() {
 	FILE *fp = fopen("try.c", "r");
 	int c;
 	c = getc(fp);
@@ -295,7 +295,7 @@ $define)
 #include <stdio.h>
 #define FILE_base(fp)	$stdio_base
 #define FILE_bufsiz(fp)	$stdio_bufsiz
-main() {
+int main() {
 	FILE *fp = fopen("try.c", "r");
 	char c = getc(fp);
 	if (