From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Tue, 4 Jan 2000 15:52:23 +0000 (+0000)
Subject: array1.C: Modify explicit external libc references to printf & atoi to conform to... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f552d62f43183546eaeb9132d2de1066f8ceef1;p=gcc.git

array1.C: Modify explicit external libc references to printf & atoi to conform to ANSI...

	* g++.old-deja/g++.brendan/array1.C: Modify explicit external libc
	references to printf & atoi to conform to ANSI standard.
	* g++.old-deja/g++.brendan/code-gen1.C: Likewise.
	* g++.old-deja/g++.brendan/code-gen2.C: Likewise.
	* g++.old-deja/g++.brendan/code-gen3.C: Likewise.
	* g++.old-deja/g++.brendan/code-gen4.C: Likewise.
	* g++.old-deja/g++.brendan/code-gen6.C: Likewise.
	* g++.old-deja/g++.brendan/complex1.C: Likewise.
	* g++.old-deja/g++.brendan/copy1.C: Likewise.
	* g++.old-deja/g++.brendan/copy2.C: Likewise.
	* g++.old-deja/g++.brendan/copy3.C: Likewise.
	* g++.old-deja/g++.brendan/copy4.C: Likewise.
	* g++.old-deja/g++.brendan/copy5.C: Likewise.
	* g++.old-deja/g++.brendan/copy6.C: Likewise.
	* g++.old-deja/g++.brendan/copy7.C: Likewise.
	* g++.old-deja/g++.brendan/copy8.C: Likewise.
	* g++.old-deja/g++.brendan/crash11.C: Likewise.
	* g++.old-deja/g++.brendan/crash14.C: Likewise.
	* g++.old-deja/g++.brendan/ctors1.C: Likewise.
	* g++.old-deja/g++.brendan/ctors2.C: Likewise.
	* g++.old-deja/g++.brendan/delete2.C: Likewise.
	* g++.old-deja/g++.brendan/dtors1.C: Likewise.
	* g++.old-deja/g++.brendan/dtors2.C: Likewise.
	* g++.old-deja/g++.brendan/dtors3.C: Likewise.
	* g++.old-deja/g++.brendan/eh1.C: Likewise.
	* g++.old-deja/g++.brendan/groff1.C: Likewise.
	* g++.old-deja/g++.brendan/init3.C: Likewise.
	* g++.old-deja/g++.brendan/misc12.C: Likewise.
	* g++.old-deja/g++.brendan/misc7.C: Likewise.
	* g++.old-deja/g++.brendan/new2.C: Likewise.
	* g++.old-deja/g++.brendan/operators4.C: Likewise.
	* g++.old-deja/g++.brendan/operators5.C: Likewise.
	* g++.old-deja/g++.brendan/overload2.C: Likewise.
	* g++.old-deja/g++.brendan/overload7.C: Likewise.
	* g++.old-deja/g++.brendan/redecl2.C: Likewise.
	* g++.old-deja/g++.brendan/reference1.C: Likewise.
	* g++.old-deja/g++.brendan/sizeof5.C: Likewise.
	* g++.old-deja/g++.brendan/template24.C: Likewise.
	* g++.old-deja/g++.brendan/template3.C: Likewise.
	* g++.old-deja/g++.brendan/vtables1.C: Likewise.
	* g++.old-deja/g++.jason/inline3.C: Likewise.
	* g++.old-deja/g++.jason/opeq.C: Likewise.
	* g++.old-deja/g++.law/arg5.C: Likewise.
	* g++.old-deja/g++.law/arm7.C: Likewise.
	* g++.old-deja/g++.law/ctors11.C: Likewise.
	* g++.old-deja/g++.law/cvt8.C: Likewise.
	* g++.old-deja/g++.law/init9.C: Likewise.
	* g++.old-deja/g++.law/refs4.C: Likewise.
	* g++.old-deja/g++.law/template2.C: Likewise.
	* g++.old-deja/g++.law/visibility24.C: Likewise.
	* g++.old-deja/g++.law/vtable3.C: Likewise.
	* g++.old-deja/g++.mike/asm2.C: Likewise.
	* g++.old-deja/g++.mike/eh1.C: Likewise.
	* g++.old-deja/g++.mike/misc1.C: Likewise.
	* g++.old-deja/g++.mike/misc13.C: Likewise.
	* g++.old-deja/g++.mike/misc14.C: Likewise.
	* g++.old-deja/g++.mike/ns12.C: Likewise.
	* g++.old-deja/g++.mike/p1248.C: Likewise.
	* g++.old-deja/g++.mike/p3708.C: Likewise.
	* g++.old-deja/g++.mike/p3708a.C: Likewise.
	* g++.old-deja/g++.mike/p3708b.C: Likewise.
	* g++.old-deja/g++.mike/p646.C: Likewise.
	* g++.old-deja/g++.mike/p700.C: Likewise.
	* g++.old-deja/g++.mike/p783.C: Likewise.
	* g++.old-deja/g++.mike/p783a.C: Likewise.
	* g++.old-deja/g++.mike/p783b.C: Likewise.
	* g++.old-deja/g++.mike/p786.C: Likewise.
	* g++.old-deja/g++.mike/p789.C: Likewise.
	* g++.old-deja/g++.mike/p789a.C: Likewise.
	* g++.old-deja/g++.mike/p807a.C: Likewise.
	* g++.old-deja/g++.other/delete3.C: Likewise.
	* g++.old-deja/g++.other/dyncast1.C: Likewise.
	* g++.old-deja/g++.other/dyncast2.C: Likewise.
	* g++.old-deja/g++.other/dyncast3.C: Likewise.
	* g++.old-deja/g++.other/empty1.C: Likewise.
	* g++.old-deja/g++.other/temporary1.C: Likewise.
	* g++.old-deja/g++.pt/memtemp14.C: Likewise.
	* g++.old-deja/g++.pt/t16.C: Likewise.
	* g++.old-deja/g++.pt/tiemann2.C: Likewise.

From-SVN: r31204
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index efe2a75d25c..adc485c627c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,85 @@
+2000-01-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* g++.old-deja/g++.brendan/array1.C: Modify explicit external libc
+	references to printf & atoi to conform to ANSI standard.
+	* g++.old-deja/g++.brendan/code-gen1.C: Likewise.
+	* g++.old-deja/g++.brendan/code-gen2.C: Likewise.
+	* g++.old-deja/g++.brendan/code-gen3.C: Likewise.
+	* g++.old-deja/g++.brendan/code-gen4.C: Likewise.
+	* g++.old-deja/g++.brendan/code-gen6.C: Likewise.
+	* g++.old-deja/g++.brendan/complex1.C: Likewise.
+	* g++.old-deja/g++.brendan/copy1.C: Likewise.
+	* g++.old-deja/g++.brendan/copy2.C: Likewise.
+	* g++.old-deja/g++.brendan/copy3.C: Likewise.
+	* g++.old-deja/g++.brendan/copy4.C: Likewise.
+	* g++.old-deja/g++.brendan/copy5.C: Likewise.
+	* g++.old-deja/g++.brendan/copy6.C: Likewise.
+	* g++.old-deja/g++.brendan/copy7.C: Likewise.
+	* g++.old-deja/g++.brendan/copy8.C: Likewise.
+	* g++.old-deja/g++.brendan/crash11.C: Likewise.
+	* g++.old-deja/g++.brendan/crash14.C: Likewise.
+	* g++.old-deja/g++.brendan/ctors1.C: Likewise.
+	* g++.old-deja/g++.brendan/ctors2.C: Likewise.
+	* g++.old-deja/g++.brendan/delete2.C: Likewise.
+	* g++.old-deja/g++.brendan/dtors1.C: Likewise.
+	* g++.old-deja/g++.brendan/dtors2.C: Likewise.
+	* g++.old-deja/g++.brendan/dtors3.C: Likewise.
+	* g++.old-deja/g++.brendan/eh1.C: Likewise.
+	* g++.old-deja/g++.brendan/groff1.C: Likewise.
+	* g++.old-deja/g++.brendan/init3.C: Likewise.
+	* g++.old-deja/g++.brendan/misc12.C: Likewise.
+	* g++.old-deja/g++.brendan/misc7.C: Likewise.
+	* g++.old-deja/g++.brendan/new2.C: Likewise.
+	* g++.old-deja/g++.brendan/operators4.C: Likewise.
+	* g++.old-deja/g++.brendan/operators5.C: Likewise.
+	* g++.old-deja/g++.brendan/overload2.C: Likewise.
+	* g++.old-deja/g++.brendan/overload7.C: Likewise.
+	* g++.old-deja/g++.brendan/redecl2.C: Likewise.
+	* g++.old-deja/g++.brendan/reference1.C: Likewise.
+	* g++.old-deja/g++.brendan/sizeof5.C: Likewise.
+	* g++.old-deja/g++.brendan/template24.C: Likewise.
+	* g++.old-deja/g++.brendan/template3.C: Likewise.
+	* g++.old-deja/g++.brendan/vtables1.C: Likewise.
+	* g++.old-deja/g++.jason/inline3.C: Likewise.
+	* g++.old-deja/g++.jason/opeq.C: Likewise.
+	* g++.old-deja/g++.law/arg5.C: Likewise.
+	* g++.old-deja/g++.law/arm7.C: Likewise.
+	* g++.old-deja/g++.law/ctors11.C: Likewise.
+	* g++.old-deja/g++.law/cvt8.C: Likewise.
+	* g++.old-deja/g++.law/init9.C: Likewise.
+	* g++.old-deja/g++.law/refs4.C: Likewise.
+	* g++.old-deja/g++.law/template2.C: Likewise.
+	* g++.old-deja/g++.law/visibility24.C: Likewise.
+	* g++.old-deja/g++.law/vtable3.C: Likewise.
+	* g++.old-deja/g++.mike/asm2.C: Likewise.
+	* g++.old-deja/g++.mike/eh1.C: Likewise.
+	* g++.old-deja/g++.mike/misc1.C: Likewise.
+	* g++.old-deja/g++.mike/misc13.C: Likewise.
+	* g++.old-deja/g++.mike/misc14.C: Likewise.
+	* g++.old-deja/g++.mike/ns12.C: Likewise.
+	* g++.old-deja/g++.mike/p1248.C: Likewise.
+	* g++.old-deja/g++.mike/p3708.C: Likewise.
+	* g++.old-deja/g++.mike/p3708a.C: Likewise.
+	* g++.old-deja/g++.mike/p3708b.C: Likewise.
+	* g++.old-deja/g++.mike/p646.C: Likewise.
+	* g++.old-deja/g++.mike/p700.C: Likewise.
+	* g++.old-deja/g++.mike/p783.C: Likewise.
+	* g++.old-deja/g++.mike/p783a.C: Likewise.
+	* g++.old-deja/g++.mike/p783b.C: Likewise.
+	* g++.old-deja/g++.mike/p786.C: Likewise.
+	* g++.old-deja/g++.mike/p789.C: Likewise.
+	* g++.old-deja/g++.mike/p789a.C: Likewise.
+	* g++.old-deja/g++.mike/p807a.C: Likewise.
+	* g++.old-deja/g++.other/delete3.C: Likewise.
+	* g++.old-deja/g++.other/dyncast1.C: Likewise.
+	* g++.old-deja/g++.other/dyncast2.C: Likewise.
+	* g++.old-deja/g++.other/dyncast3.C: Likewise.
+	* g++.old-deja/g++.other/empty1.C: Likewise.
+	* g++.old-deja/g++.other/temporary1.C: Likewise.
+	* g++.old-deja/g++.pt/memtemp14.C: Likewise.
+	* g++.old-deja/g++.pt/t16.C: Likewise.
+	* g++.old-deja/g++.pt/tiemann2.C: Likewise.
+
 1999-12-30  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* gcc.dg/991230-1.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/array1.C b/gcc/testsuite/g++.old-deja/g++.brendan/array1.C
index 18129589d9f..416416f4e5e 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/array1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/array1.C
@@ -2,6 +2,6 @@
 // Special g++ Options: -fconserve-space -fcommon
 // GROUPS passed array-bindings
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 char array[~(~0ul>>1)|~(0ul>>3)];  // ERROR - overflow in array dimension.*
 int main () { printf ("PASS\n"); return 0; }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
index 84dd634d9cf..ddd419bb054 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
@@ -2,7 +2,7 @@
 // Check that sub-word sized structs/classes are passed correctly
 // if the struct/class has a constructor (i.e. ANY constructor).
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	unsigned int f1 : 8;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
index 133755e894d..281fce082ad 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
@@ -2,7 +2,7 @@
 // Check that declarations with initializations are executed
 // correctly.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int main ()
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
index 6d73bd2336e..a28e12fe39d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
@@ -2,7 +2,7 @@
 // Check that passing things which are not a multiple of
 // 4 bytes in size doesn't mess up other subsequent parameters.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	int f1 : 8;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
index e29b16a2b09..beb21586330 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
@@ -9,7 +9,7 @@
 //
 // Workaround - declare "f1_arg" as type "short int".
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 short int v2;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
index ea5d730949d..95880809415 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
@@ -2,7 +2,7 @@
 // Check that type float parameters can be correctly passed to
 // methods.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 class tres_floats {
 	float ff1;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C b/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
index 908b4ca5f90..f6998fd3494 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
@@ -5,7 +5,7 @@
 // a bug where the compiler was not converting the integer `90' to a
 // complex number, unless you did `90.0'.  Fixed 10/1/1997.
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 __complex__ double cd;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
index 27d959f8320..4cba7309736 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
@@ -1,5 +1,5 @@
 // GROUPS passed copy-ctors
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 int count = 0;
 
 class C {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
index 0ecc1e9db10..b1ebf8cf7ec 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
@@ -27,7 +27,7 @@ Post foo
 
 */
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
index 3b1edd5f0ab..7c5d01f9c70 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
@@ -18,7 +18,7 @@ If I compile it with g++ (gcc version 2.2.2) and run it I get:
 	A::~A()
 
 */
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy4.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy4.C
index 35b53932141..e8795532b8a 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy4.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy4.C
@@ -17,7 +17,7 @@
 // 	  ~A()
 // 	  ~A()
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
index 277940ba240..a42bdb5a775 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
@@ -21,7 +21,7 @@ BaseClass::Increm --> {i=7, virtMember()=30}
 b=9  b.virtMember()=30
 */
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 void die () { printf ("FAIL\n"); exit (1); }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy6.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy6.C
index d15a4beee15..8869cb84374 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy6.C
@@ -24,7 +24,7 @@ constructing from unsigned
 
 */
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
index e2f4e7ac286..ec76f657946 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
@@ -1,5 +1,5 @@
 // GROUPS passed copy-ctors
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 void die () { printf ("FAIL\n"); exit (1); }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy8.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy8.C
index fe248bae34d..df77e0149e3 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy8.C
@@ -17,7 +17,7 @@ typescript that lists the program, shows how I compiled it, and shows the
 incorrect output.
 */
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
index 00c30867cf9..1f125937acd 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
@@ -1,6 +1,6 @@
 // Build don't link: 
 // GROUPS passed old-abort
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class A {
         int	i; // ERROR - private
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
index dc2812191ac..d5d0bf49db8 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
@@ -1,6 +1,6 @@
 // Build don't link: 
 // GROUPS passed old-abort
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 
 class cl
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C b/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
index eaf487159d8..99f8c04860d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
@@ -1,7 +1,7 @@
 // GROUPS passed constructors
 // Check that global level object constructors get called.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	int f1;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C b/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
index 2f83ce1cdb8..64a790f40f0 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
@@ -2,7 +2,7 @@
 // Check that sub-words sized class members are correctly set
 // by constructors.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	int f1 : 8;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/delete2.C b/gcc/testsuite/g++.old-deja/g++.brendan/delete2.C
index f2bacde1185..3f18a48bef5 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/delete2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/delete2.C
@@ -2,7 +2,7 @@
 // Check that using the delete operator with a null pointer
 // is allowed (as called for by The Book, pg. 259)
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	int member;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
index dbbfa80f9f4..a6ce7e042ee 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
@@ -5,7 +5,7 @@
 //
 // (also check that this execution doesn't seg-fault)
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int derived_destructed;
 int base_destructed;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
index 511ab7f231c..a1d402934c6 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
@@ -9,7 +9,7 @@
 //    the virtual table, rather than directly. This, of course, results in the
 //    infinite recursion.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int errors = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
index a1ca853cf91..588cb22b4db 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
@@ -6,7 +6,7 @@
 // Note that in order for this test to work properly, the destructor
 // for the base class should be explicitly declared to be virtual.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int member_destructor_calls = 0;
 int middle_destructor_calls = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/eh1.C b/gcc/testsuite/g++.old-deja/g++.brendan/eh1.C
index a6683060c25..8f346a4ab59 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/eh1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/eh1.C
@@ -1,7 +1,7 @@
 // Special g++ Options: -O
 // PRMS Id: 10776
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class Foo 
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C b/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
index 179ef30ab04..89e8469f720 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
@@ -1,7 +1,7 @@
 // GROUPS passed groff
 /* This should compile properly with the new overloading scheme.  */
 
-extern "C" void printf (const char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int win = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/init3.C b/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
index b86c2c7e792..c400419424b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
@@ -2,7 +2,7 @@
 // p2766: Make sure that members are initialized in order of declaration
 // in the class, not in order of specification in the mem-initializer list.
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc12.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc12.C
index 73db9bfccd4..6dd31d0669a 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc12.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc12.C
@@ -1,6 +1,6 @@
 // GROUPS passed miscellaneous
 extern "C" void exit (int);
-extern "C" int printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 /* Make sure cp-lex.c handles these properly--if this links, that means
    it emitted the strings instead of __FUNCTION__.0, etc.  */
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
index af07d6f6d13..0d85bdcce07 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
@@ -1,5 +1,5 @@
 // GROUPS passed miscellaneous
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 int main()
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/new2.C b/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
index 64b3d51e08a..b9482d936e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
@@ -6,7 +6,7 @@
 // of whether or not the constructor for the given class is defined
 // before or after the new operator is even declared.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 typedef __SIZE_TYPE__ size_t;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/operators4.C b/gcc/testsuite/g++.old-deja/g++.brendan/operators4.C
index b56d26c073d..2fee7e6720e 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/operators4.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/operators4.C
@@ -6,7 +6,7 @@
 //
 // This test fails (in test5()) when compiled with g++ 1.34.1.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int function (char c);
 int function (float f);
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C b/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
index 84c09a2a4b2..230d3dbaa90 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
@@ -1,7 +1,7 @@
 // GROUPS passed operators
 // Check that operators may be (directly) recursive.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	int i;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
index 75068da88bb..44f24bd7bfb 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
@@ -3,7 +3,7 @@
 // functions are generated even where the type of the formal
 // arguments for the overloadings are similar or related.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int proper_method_called = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
index ec2685c4067..6e5efcf6630 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
@@ -1,5 +1,5 @@
 // GROUPS passed overloading
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 struct NoName {
         
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C b/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
index 58942197ddf..25f7b6bea29 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
@@ -5,7 +5,7 @@
 // of argument defaults provided, that correct values are
 // passed at all call points anyway.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 void receiver (int ii, int jj);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C b/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
index 84ad6f4bf20..456d7ef5551 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
@@ -9,7 +9,7 @@
 // This test fails with G++ 1.35.0- (pre-release).
 // Reported 4/4/89 by Kim Smith
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 struct base {
 	mutable int data_member;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C b/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
index 0ef9d9c5ed1..84bebcebe31 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
@@ -1,7 +1,7 @@
 // GROUPS passed sizeof
 // ARM $5.3.2
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class foo {};
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template24.C b/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
index 34549a001d7..dd2b2f11cad 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
@@ -1,5 +1,5 @@
 // GROUPS passed templates
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 template <class F>
 class Temp
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template3.C b/gcc/testsuite/g++.old-deja/g++.brendan/template3.C
index 3900421d12f..6fec8d8fa88 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template3.C
@@ -1,5 +1,5 @@
 // GROUPS passed templates
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/vtables1.C b/gcc/testsuite/g++.old-deja/g++.brendan/vtables1.C
index 984ce18ce6b..d6ce085fb71 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/vtables1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/vtables1.C
@@ -2,7 +2,7 @@
 // Check that virtual function tables are generated and used
 // even for struct's/classes which have no explicit constructors.
 
-extern "C" void printf (char *, ...); 
+extern "C" int printf (const char *, ...); 
 
 int base_func_member_1_called = 0;
 int derived_func_member_1_called = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/inline3.C b/gcc/testsuite/g++.old-deja/g++.jason/inline3.C
index 00d57eb3ea1..c9f88dc0c82 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/inline3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/inline3.C
@@ -1,7 +1,7 @@
 // Testcase for order of destruction.
 // Special g++ Options: -O2
 
-extern "C" int printf( char const*, ... );
+extern "C" int printf (const char *, ...);
 int c;
 int r;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/opeq.C b/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
index ac099a4a667..f488a7c6d88 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
@@ -2,7 +2,7 @@
 // Bug: Generating default op= didn't set TYPE_HAS_ASSIGNMENT, so it wasn't
 // found.
 
-extern "C" int printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class Y 
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg5.C b/gcc/testsuite/g++.old-deja/g++.law/arg5.C
index 276068aa8b6..8db62856828 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg5.C
@@ -3,7 +3,7 @@
 extern double pow(double,int*);
 
 extern "C" {
-  extern int    printf(char*,...);
+  extern int printf (const char *, ...);
   extern double pow(double, double);
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm7.C b/gcc/testsuite/g++.old-deja/g++.law/arm7.C
index 1f3d43056ad..0ad9dddff7e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm7.C
@@ -7,7 +7,7 @@
 // Date: Sat, 6 Mar 93 06:46:27 -0600
 
 
-extern "C" void printf(const char *,...);
+extern "C" int printf (const char *, ...);
 
 class Base {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors11.C b/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
index 3c393561f6a..231d08ede6e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
@@ -4,7 +4,7 @@
 // Message-Id: <9302081631.AA14744@tera.com>
 // From: rrh@tera.com (Robert R. Henry)
 // Date: Mon, 8 Feb 93 08:31:39 PST
-extern "C" void printf(const char *,...);
+extern "C" int printf (const char *, ...);
 class A{
 public:
   inline A(int x){printf("constructing A with %d\n", x);}
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt8.C b/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
index f97790a19e6..8d278a40bd0 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
@@ -6,7 +6,7 @@
 // Subject: g++ 2.2.2 seems to be forgetting a "const"
 // Date: Mon, 14 Sep 92 10:09:58 -0500
 
-extern "C" void printf(...);
+extern "C" int printf (const char *, ...);
 
 struct A {
         int i;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init9.C b/gcc/testsuite/g++.old-deja/g++.law/init9.C
index d6cec1b27aa..9806965f337 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init9.C
@@ -5,7 +5,7 @@
 // Subject:  excess elements in aggr initzer
 // Message-ID: <Pine.3.07.9306061541.A10267-b100000@fubar.cs.montana.edu>
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class samp {
         int a;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs4.C b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
index 40e199a6858..7e6892793aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
@@ -1,5 +1,5 @@
 // GROUPS passed references
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 const int& min(const int& tX, const int& tY)
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/template2.C b/gcc/testsuite/g++.old-deja/g++.law/template2.C
index 7fa2c766b83..c5d6b185208 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/template2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/template2.C
@@ -1,6 +1,6 @@
 // GROUPS passed templates
 // Special g++ Options: -fguiding-decls
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 template<class T> T max(T a, T b) { return a > b ? a : b; }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
index dab2148cc64..fc22a15b5b4 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
@@ -8,7 +8,7 @@
 /*
  * private.cc
  */
-extern "C" void printf(...);
+extern "C" int printf (const char *, ...);
 
 template <class T>
 class A
diff --git a/gcc/testsuite/g++.old-deja/g++.law/vtable3.C b/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
index 9a6e4a28508..4e0e0b05f73 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
@@ -5,7 +5,7 @@
 // Subject:  g++-2.6.2: Virtual inheritance causes incorrect padding
 // Message-ID: <Pine.SOL.3.91.941128194453.7510A-100000@gabriel>
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 struct A {
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/asm2.C b/gcc/testsuite/g++.old-deja/g++.mike/asm2.C
index 59771d6c6a3..b5f11e1cfd9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/asm2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/asm2.C
@@ -1,10 +1,7 @@
 // Compile with -S, there should be no references to
 // LTRAMP in the output.
 
-extern "C"
-{
-  int printf (char *, ...);
-}
+extern "C" int printf (const char *, ...);
 
 void
 sub2 (void (*func) ())
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh1.C b/gcc/testsuite/g++.old-deja/g++.mike/eh1.C
index 95da594c2fc..5e52f7de91d 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh1.C
@@ -1,7 +1,7 @@
 // Build don't link:
 // Special g++ Options: -fexceptions -O -S
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" int atoi (const char *);
 extern "C" void exit (int);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc1.C b/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
index 0604eac63ac..40a52e8f449 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
@@ -2,7 +2,7 @@
 /* g++ constructs j 13 times, and destructs it once. */
 
 extern "C" {
-  int printf(...);
+  int printf (const char *, ...);
   void exit(int);
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc13.C b/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
index 166e33dce6a..5458f5ca483 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
@@ -1,5 +1,5 @@
 // GROUPS passed vtable
-extern "C" int printf(...);
+extern "C" int printf (const char *, ...);
 enum { vf_request, vf_event } want;
 
 int errs = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc14.C b/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
index 4886dcc9274..4773fd3a775 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
@@ -1,5 +1,5 @@
 // GROUPS passed
-extern "C" int printf(...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit(int);
 
 class A {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns12.C b/gcc/testsuite/g++.old-deja/g++.mike/ns12.C
index 38978109623..79444ae57d4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns12.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns12.C
@@ -2,7 +2,7 @@ namespace {
   int i = 10;
   enum fish { one = 1, two = 2, red = 3, blue = 4 };
 }
-extern "C" void printf (const char *, ...);
+extern "C" int printf (const char *, ...);
 int main(void)
 {
   if (i != 10) {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p1248.C b/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
index 035e8e1828f..2ecd071a14e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
@@ -1,5 +1,5 @@
 // GROUPS passed pure-virt
-extern "C" { void printf(const char *, ...); }
+extern "C" int printf (const char *, ...);
 class Base {
 public:
   virtual ~Base() =0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
index cda1108d629..c34c20c72d4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
@@ -1,7 +1,7 @@
 // prms-id: 3708
 
-extern "C" void printf (char *, ...);
-extern "C" int atoi (char *);
+extern "C" int printf (const char *, ...);
+extern "C" int atoi (const char *);
 
 void *ptr;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
index 03fd1a18c74..6eeac35203f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
@@ -1,7 +1,7 @@
 // prms-id: 3708
 
-extern "C" void printf (char *, ...);
-extern "C" int atoi (char *);
+extern "C" int printf (const char *, ...);
+extern "C" int atoi (const char *);
 
 void *ptr;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
index 42510074be3..9816cc4c804 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
@@ -1,6 +1,6 @@
 // prms-id: 3708
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit(int);
 
 void *ptr;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p646.C b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
index 2644c1b43df..54206ac0606 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p646.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
@@ -10,7 +10,7 @@
 
 extern "C"
 {
-  void printf (char *, ...);
+  int printf (const char *, ...);
   void abort ();
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p700.C b/gcc/testsuite/g++.old-deja/g++.mike/p700.C
index 580895e557b..7c4cbc83064 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p700.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p700.C
@@ -1628,7 +1628,7 @@ int    vprintf(const char*, ... );
 
 
 
-char*  sprintf(char*, const char*, ...);
+int  sprintf(char*, const char*, ...);
 char*  vsprintf(char*, const char*, ...);
 
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783.C b/gcc/testsuite/g++.old-deja/g++.mike/p783.C
index 4194fa8b2ba..c84e4ca1886 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783.C
@@ -1,6 +1,6 @@
 // prms-id: 783
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 
 class C {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783a.C b/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
index 6321a7b3eb5..167c9d9d23f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
@@ -2,7 +2,7 @@
 // Deleting an object many times is a lose.
 // prms-id: 783
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 class C {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783b.C b/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
index 35a18f3f99b..b434d76f776 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
@@ -3,7 +3,7 @@
 // built.
 // prms-id: 783
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit (int);
 
 class C {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p786.C b/gcc/testsuite/g++.old-deja/g++.mike/p786.C
index c55d0c07f88..b7d19fd5689 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p786.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p786.C
@@ -1,6 +1,6 @@
 // prms-id: 786
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit(int);
 class C
    {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p789.C b/gcc/testsuite/g++.old-deja/g++.mike/p789.C
index 9cad4fd805f..f511b39e84a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p789.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p789.C
@@ -1,6 +1,6 @@
 // prms-id: 789
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 struct foo
 {
   static int count;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p789a.C b/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
index b0df9f646de..b90cc7691a1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
@@ -4,7 +4,7 @@
 // used to work. :-(
 // prms-id: 789
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 struct foo
 {
   static int count;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p807a.C b/gcc/testsuite/g++.old-deja/g++.mike/p807a.C
index d7b797af8e0..2c8a149fde7 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p807a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p807a.C
@@ -3,7 +3,7 @@
 
 // See ARM page 275 Section 12.3.2
 
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 extern "C" void exit(int);
 
 class B;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/delete3.C b/gcc/testsuite/g++.old-deja/g++.other/delete3.C
index eb56350371b..d5873f77be2 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/delete3.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/delete3.C
@@ -2,7 +2,7 @@
 
 int i;
 
-extern "C" void printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 template <class T, class U> 
 struct map {
diff --git a/gcc/testsuite/g++.old-deja/g++.other/dyncast1.C b/gcc/testsuite/g++.old-deja/g++.other/dyncast1.C
index 0a3a09b9a12..1f386845f49 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/dyncast1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/dyncast1.C
@@ -5,7 +5,7 @@
 // and therefor failing with result 0.
 
 extern "C" void abort();
-extern "C" void printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 static int errors = 0;
 void error(int i)
diff --git a/gcc/testsuite/g++.old-deja/g++.other/dyncast2.C b/gcc/testsuite/g++.old-deja/g++.other/dyncast2.C
index da537500b4d..6a2e7382a4c 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/dyncast2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/dyncast2.C
@@ -5,7 +5,7 @@
 // baseclasses.
 
 extern "C" void abort();
-extern "C" void printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 static int errors = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/dyncast3.C b/gcc/testsuite/g++.old-deja/g++.other/dyncast3.C
index 76f8ca7ed1a..5b33767ff13 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/dyncast3.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/dyncast3.C
@@ -5,7 +5,7 @@
 // and therefor failing with result 0.
 
 extern "C" void abort();
-extern "C" void printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 static int errors = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/empty1.C b/gcc/testsuite/g++.old-deja/g++.other/empty1.C
index 0789884079b..1210327ee17 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/empty1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/empty1.C
@@ -1,7 +1,7 @@
 // Origin: Mark Mitchell <mark@codesourcery.com>
 
 extern "C" void abort();
-extern "C" void printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 int i;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/temporary1.C b/gcc/testsuite/g++.old-deja/g++.other/temporary1.C
index 93cd7097783..c441196eab0 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/temporary1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/temporary1.C
@@ -1,4 +1,4 @@
-extern "C" int printf(char*, ...);
+extern "C" int printf (const char *, ...);
 
 int c, d;
 class Foo 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp14.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp14.C
index e24a3a7f0de..39c44efa498 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp14.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp14.C
@@ -1,6 +1,6 @@
 // Build don't run:
 // GROUPS passed templates membertemplates
-extern "C" const char* printf(const char*, ...);
+extern "C" int printf (const char *, ...);
 
 template <class T>
 struct S
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/t16.C b/gcc/testsuite/g++.old-deja/g++.pt/t16.C
index 4cdf3a26803..02ceaee7bf1 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/t16.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/t16.C
@@ -1,4 +1,4 @@
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 template <class T> T max (const T&x, const T&y)
 {
   return (x>y)?x:y;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C b/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
index 4c71541cee2..6bfcb48ff22 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
@@ -1,4 +1,4 @@
-extern "C" void printf (char *, ...);
+extern "C" int printf (const char *, ...);
 template <class T> T max (const T&x, const T&y)
 {
   return (x>y)?x:y;