re GNATS libgcj/261 (Macro-inconsistency)

	Fix for PR libgcj/261:
	* include/win32-signal.h (MAKE_THROW_FRAME): Added `_exception'
	argument.
	* include/sparc-signal.h (MAKE_THROW_FRAME): Added `_exception'
	argument.  (This is a patch from long ago that somehow went
	missing.)

From-SVN: r34575

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 70d443047284c95b85ca385ceff0ae3f7f8bdcb6..befafddf4cc64b98f2be6e1b8d37ef617254b01a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-16  Tom Tromey  <tromey@cygnus.com>
+
+       Fix for PR libgcj/261:
+       * include/win32-signal.h (MAKE_THROW_FRAME): Added `_exception'
+       argument.
+       * include/sparc-signal.h (MAKE_THROW_FRAME): Added `_exception'
+       argument.  (This is a patch from long ago that somehow went
+       missing.)
+
 2000-06-15  Tom Tromey  <tromey@cygnus.com>
 
        * gnu/gcj/convert/natIconv.cc (iconv_adapter): New function.

diff --git a/libjava/include/sparc-signal.h b/libjava/include/sparc-signal.h
index 4ae0c95927f4a0dc2feee96981223a54e9aa6e78..03538eccf209fe93dbeb2ab928ba933328a8c53c 100644 (file)
--- a/libjava/include/sparc-signal.h
+++ b/libjava/include/sparc-signal.h
@@ -1,6 +1,6 @@
 // sparc-signal.h - Catch runtime signals and turn them into exceptions.
 
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -23,7 +23,7 @@ static void _name (int _dummy, siginfo_t *_info, void *arg)
 #define FLUSH_REGISTER_WINDOWS                                 \
   asm volatile ("ta 3");
 
-#define MAKE_THROW_FRAME                                       \
+#define MAKE_THROW_FRAME(_exception)                           \
 do                                                             \
 {                                                              \
   ucontext_t *_context = (ucontext_t *) arg;                    \

diff --git a/libjava/include/win32-signal.h b/libjava/include/win32-signal.h
index b4a60be880863d97d9d729e25fc28f160610b2ee..e12c3c3668125c54b1b901a6b3ed9e5fe57a5753 100644 (file)
--- a/libjava/include/win32-signal.h
+++ b/libjava/include/win32-signal.h
@@ -1,6 +1,6 @@
 // win32-signal.h - Catch runtime signals and turn them into exceptions.
 
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -20,7 +20,7 @@ details.  */
 #define SIGNAL_HANDLER(_name)  \
 static void _name (int _dummy)
 
-#define MAKE_THROW_FRAME    do {} while (0)
+#define MAKE_THROW_FRAME(_exception)    do {} while (0)
 #define HANDLE_DIVIDE_OVERFLOW do {} while (0)
 
 #define INIT_SEGV                                              \