This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch installed to remove variadic K&R macros from java dir
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- To: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Thu, 9 Jan 2003 18:19:57 -0500 (EST)
- Subject: Patch installed to remove variadic K&R macros from java dir
Pre-approved in private email by Andrew Haley
Tested on sparc-sun-solaris2.7.
2003-01-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* jv-scan.c, parse.y: Remove VPARAMS, VA_OPEN, VA_FIXEDARG and
VA_CLOSE.
diff -rup orig/egcc-CVS20030109/gcc/java/jv-scan.c egcc-CVS20030109/gcc/java/jv-scan.c
--- orig/egcc-CVS20030109/gcc/java/jv-scan.c Wed Jan 1 16:00:36 2003
+++ egcc-CVS20030109/gcc/java/jv-scan.c Thu Jan 9 13:06:26 2003
@@ -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 -rup orig/egcc-CVS20030109/gcc/java/parse.y egcc-CVS20030109/gcc/java/parse.y
--- orig/egcc-CVS20030109/gcc/java/parse.y Wed Jan 1 16:00:38 2003
+++ egcc-CVS20030109/gcc/java/parse.y Thu Jan 9 13:07:58 2003
@@ -3107,28 +3107,26 @@ issue_warning_error_from_context (cl, ms
/* 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