* jv-scan.c, parse.y: Remove VPARAMS, VA_OPEN, VA_FIXEDARG and

	VA_CLOSE.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61129 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 21 insertions, 20 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4aaf8d2f2aa..625b9553ba0 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* jv-scan.c, parse.y: Remove VPARAMS, VA_OPEN, VA_FIXEDARG and
+	VA_CLOSE.
+
 2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
 
 	* Make-lang.in (java.install-common, java.uninstall,
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index dbe743ee98f..369f0f468d2 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -242,28 +242,26 @@ DEFUN (main, (argc, argv),
    functions */
 
 void
-fatal_error VPARAMS ((const char *s, ...))
+fatal_error (const char *s, ...)
 {
-  VA_OPEN (ap, s);
-  VA_FIXEDARG (ap, const char *, s);
-
+  va_list ap;
+  va_start (ap, s);
   fprintf (stderr, "%s: error: ", exec_name);
   vfprintf (stderr, s, ap);
   fputc ('\n', stderr);
-  VA_CLOSE (ap);
+  va_end (ap);
   exit (1);
 }
 
 void
-warning VPARAMS ((const char *s, ...))
+warning (const char *s, ...)
 {
-  VA_OPEN (ap, s);
-  VA_FIXEDARG (ap, const char *, s);
-
+  va_list ap;
+  va_start (ap, s);
   fprintf (stderr, "%s: warning: ", exec_name);
   vfprintf (stderr, s, ap);
   fputc ('\n', stderr);
-  VA_CLOSE (ap);
+  va_end (ap);
 }
 
 void
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 6e83b54a7a2..4da4b5f5656 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -3107,28 +3107,26 @@ issue_warning_error_from_context (cl, msg, ap)
 /* Issue an error message at a current source line CL */
 
 void
-parse_error_context VPARAMS ((tree cl, const char *msg, ...))
+parse_error_context (tree cl, const char *msg, ...)
 {
-  VA_OPEN (ap, msg);
-  VA_FIXEDARG (ap, tree, cl);
-  VA_FIXEDARG (ap, const char *, msg);
+  va_list ap;
+  va_start (ap, msg);
   issue_warning_error_from_context (cl, msg, ap);
-  VA_CLOSE (ap);
+  va_end (ap);
 }
 
 /* Issue a warning at a current source line CL */
 
 static void
-parse_warning_context VPARAMS ((tree cl, const char *msg, ...))
+parse_warning_context (tree cl, const char *msg, ...)
 {
-  VA_OPEN (ap, msg);
-  VA_FIXEDARG (ap, tree, cl);
-  VA_FIXEDARG (ap, const char *, msg);
+  va_list ap;
+  va_start (ap, msg);
 
   force_error = do_warning = 1;
   issue_warning_error_from_context (cl, msg, ap);
   do_warning = force_error = 0;
-  VA_CLOSE (ap);
+  va_end (ap);
 }
 
 static tree