diff --git a/gcc/combine.c b/gcc/combine.c
index 166b8b04d37..f80d34d19e1 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -413,7 +413,7 @@ static rtx simplify_shift_const	PROTO((rtx, enum rtx_code, enum machine_mode,
 				       rtx, int));
 static int recog_for_combine	PROTO((rtx *, rtx, rtx *));
 static rtx gen_lowpart_for_combine  PROTO((enum machine_mode, rtx));
-static rtx gen_rtx_combine PROTO((enum rtx_code code, enum machine_mode mode,
+static rtx gen_rtx_combine PVPROTO((enum rtx_code code, enum machine_mode mode,
 				  ...));
 static rtx gen_binary		PROTO((enum rtx_code, enum machine_mode,
 				       rtx, rtx));
diff --git a/gcc/expr.h b/gcc/expr.h
index a0c7ce5fdaf..3b02d694a46 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -624,9 +624,9 @@ extern void emit_push_insn PROTO((rtx, enum machine_mode, tree, rtx, int,
 				  int, rtx, int, rtx, rtx));
 
 /* Emit library call.  */
-extern void emit_library_call PROTO((rtx orgfun, int no_queue,
+extern void emit_library_call PVPROTO((rtx orgfun, int no_queue,
   enum machine_mode outmode, int nargs, ...));
-extern rtx emit_library_call_value PROTO((rtx orgfun, rtx value, int no_queue,
+extern rtx emit_library_call_value PVPROTO((rtx orgfun, rtx value, int no_queue,
   enum machine_mode outmode, int nargs, ...));
 
 /* Expand an assignment that stores the value of FROM into TO. */
diff --git a/gcc/gcc.c b/gcc/gcc.c
index f9bf9c60524..a41e960920b 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -62,9 +62,11 @@ compilation is specified by a string called a "spec".  */
 
 #ifndef VPROTO
 #ifdef __STDC__
+#define PVPROTO(ARGS)		ARGS
 #define VPROTO(ARGS)		ARGS
 #define VA_START(va_list,var)	va_start(va_list,var)
 #else
+#define PVPROTO(ARGS)		()
 #define VPROTO(ARGS)		(va_alist) va_dcl
 #define VA_START(va_list,var)	va_start(va_list)
 #endif
@@ -215,8 +217,8 @@ static void pfatal_with_name	PROTO((char *));
 static void perror_with_name	PROTO((char *));
 static void perror_exec		PROTO((char *));
 #ifdef HAVE_VPRINTF
-static void fatal		PROTO((char *, ...));
-static void error		PROTO((char *, ...));
+static void fatal		PVPROTO((char *, ...));
+static void error		PVPROTO((char *, ...));
 #else
 /* We must not provide any prototype here, even if ANSI C.  */
 static void fatal		PROTO(());
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index cdc78e0461e..b57bfd45000 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -359,9 +359,9 @@ static char *alternative_name;
 rtx frame_pointer_rtx, hard_frame_pointer_rtx, stack_pointer_rtx;
 rtx arg_pointer_rtx;
 
-static rtx attr_rtx		PROTO((enum rtx_code, ...));
+static rtx attr_rtx		PVPROTO((enum rtx_code, ...));
 #ifdef HAVE_VPRINTF
-static char *attr_printf	PROTO((int, char *, ...));
+static char *attr_printf	PVPROTO((int, char *, ...));
 #else
 static char *attr_printf ();
 #endif
diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index f40e839fd45..79add8d1dea 100644
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -618,8 +618,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 typedef void *PTR_T;
 typedef const void *CPTR_T;
 #define __proto(x) x
+#ifndef VPROTO
+#define PVPROTO(ARGS)		ARGS
 #define VPROTO(ARGS)            ARGS
 #define VA_START(va_list,var)  va_start(va_list,var)
+#endif
 #else
 
 #if defined(_STDIO_H_) || defined(__STDIO_H__)		/* Ultrix 4.0, SGI */
@@ -633,9 +636,12 @@ typedef char *CPTR_T;
 
 #define __proto(x) ()
 #define const
+#ifndef VPROTO
+#define PVPROTO(ARGS)		()
 #define VPROTO(ARGS)            (va_alist) va_dcl
 #define VA_START(va_list,var)  va_start(va_list)
 #endif
+#endif
 
 /* Do to size_t being defined in sys/types.h and different
    in stddef.h, we have to do this by hand.....  Note, these
@@ -665,8 +671,8 @@ extern PTR_T	xrealloc	__proto((PTR_T, Size_t));
 extern void	xfree		__proto((PTR_T));
 
 #ifdef HAVE_VPRINTF
-extern void	fatal		__proto((char *format, ...));
-extern void	error		__proto((char *format, ...));
+extern void	fatal		PVPROTO((char *format, ...));
+extern void	error		PVPROTO((char *format, ...));
 #else
 /* We must not provide any prototype here, even if ANSI C.  */
 extern void	fatal		__proto(());
diff --git a/gcc/output.h b/gcc/output.h
index 97aeb15e368..a25227067cf 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -32,7 +32,7 @@ extern void output_asm_insn PROTO((char *, rtx *));
 
 /* Output a string of assembler code, substituting numbers, strings
    and fixed syntactic prefixes.  */
-extern void asm_fprintf STDIO_PROTO((FILE *file, char *p, ...));
+extern void asm_fprintf STDIO_PROTO(PVPROTO((FILE *file, char *p, ...)));
 
 /* Print an integer constant expression in assembler syntax.
    Addition and subtraction are the only arithmetic
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 1a87233ec69..b21f0e31fd6 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -110,20 +110,20 @@ extern void dump_sched_info ();
 extern void dump_local_alloc ();
 
 void rest_of_decl_compilation ();
-void error_with_file_and_line PROTO((char *file, int line, char *s, ...));
-void error_with_decl PROTO((tree decl, char *s, ...));
-void error_for_asm PROTO((rtx insn, char *s, ...));
-void error PROTO((char *s, ...));
-void fatal PROTO((char *s, ...));
-void warning_with_file_and_line PROTO((char *file, int line, char *s, ...));
-void warning_with_decl PROTO((tree decl, char *s, ...));
-void warning_for_asm PROTO((rtx insn, char *s, ...));
-void warning PROTO((char *s, ...));
-void pedwarn PROTO((char *s, ...));
-void pedwarn_with_decl PROTO((tree decl, char *s, ...));
-void pedwarn_with_file_and_line PROTO((char *file, int line, char *s, ...));
-void sorry PROTO((char *s, ...));
-void really_sorry PROTO((char *s, ...));
+void error_with_file_and_line PVPROTO((char *file, int line, char *s, ...));
+void error_with_decl PVPROTO((tree decl, char *s, ...));
+void error_for_asm PVPROTO((rtx insn, char *s, ...));
+void error PVPROTO((char *s, ...));
+void fatal PVPROTO((char *s, ...));
+void warning_with_file_and_line PVPROTO((char *file, int line, char *s, ...));
+void warning_with_decl PVPROTO((tree decl, char *s, ...));
+void warning_for_asm PVPROTO((rtx insn, char *s, ...));
+void warning PVPROTO((char *s, ...));
+void pedwarn PVPROTO((char *s, ...));
+void pedwarn_with_decl PVPROTO((tree decl, char *s, ...));
+void pedwarn_with_file_and_line PVPROTO((char *file, int line, char *s, ...));
+void sorry PVPROTO((char *s, ...));
+void really_sorry PVPROTO((char *s, ...));
 void fancy_abort ();
 #ifndef abort
 void abort ();