summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/boehm.cc2
-rw-r--r--libjava/exception.cc2
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2a2a9e2e9a5..a456444bff4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-02 Bryce McKinlay <bryce@albatross.co.nz>
+
+ * boehm.cc (_Jv_RegisterFinalizer): Cast `meth' to GC_PTR.
+ * exception.cc (_Jv_Throw): Cast `_Jv_type_matcher' to __eh_matcher.
+
1999-08-01 Alexandre Oliva <oliva@dcc.unicamp.br>
* configure.in: Check for bstring.h.
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index c41dab94387..3fc0a5d664b 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -260,7 +260,7 @@ call_finalizer (GC_PTR obj, GC_PTR client_data)
void
_Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *meth)
{
- GC_REGISTER_FINALIZER_NO_ORDER (object, call_finalizer, meth,
+ GC_REGISTER_FINALIZER_NO_ORDER (object, call_finalizer, (GC_PTR)meth,
NULL, NULL);
}
diff --git a/libjava/exception.cc b/libjava/exception.cc
index 644f80b8b0f..0c6553ff5bc 100644
--- a/libjava/exception.cc
+++ b/libjava/exception.cc
@@ -147,7 +147,7 @@ _Jv_Throw (void *value)
_Jv_eh_alloc ();
ehinfo = *(__get_eh_info ());
}
- ehinfo->eh_info.match_function = _Jv_type_matcher;
+ ehinfo->eh_info.match_function = (__eh_matcher)_Jv_type_matcher;
ehinfo->eh_info.language = EH_LANG_Java;
ehinfo->eh_info.version = 1;
ehinfo->value = value;